Updated python trunk to SFML 1.6
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1373 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
3247f441f8
commit
eacc8e27cc
@ -10,16 +10,16 @@ setup(name='PySFML',
|
|||||||
author_email='remi.k2620@gmail.com',
|
author_email='remi.k2620@gmail.com',
|
||||||
url='http://www.sfml-dev.org/',
|
url='http://www.sfml-dev.org/',
|
||||||
license='zlib/png',
|
license='zlib/png',
|
||||||
ext_modules=[ Extension('PySFML.sf', \
|
ext_modules=[ Extension('PySFML.sf',
|
||||||
['src/Clock.cpp', 'src/Color.cpp', 'src/Drawable.cpp', \
|
['src/Clock.cpp', 'src/Color.cpp', 'src/Drawable.cpp',
|
||||||
'src/Event.cpp', 'src/Image.cpp', 'src/Input.cpp', 'src/Key.cpp', 'src/main.cpp', 'src/Music.cpp', \
|
'src/Event.cpp', 'src/Image.cpp', 'src/Input.cpp', 'src/Key.cpp', 'src/main.cpp', 'src/Music.cpp',
|
||||||
'src/PostFX.cpp', 'src/Rect.cpp', 'src/RenderWindow.cpp', 'src/Sleep.cpp', \
|
'src/PostFX.cpp', 'src/Rect.cpp', 'src/RenderWindow.cpp', 'src/Sleep.cpp',
|
||||||
'src/Sprite.cpp', 'src/String.cpp', 'src/VideoMode.cpp', 'src/View.cpp', 'src/Window.cpp', \
|
'src/Sprite.cpp', 'src/String.cpp', 'src/VideoMode.cpp', 'src/View.cpp', 'src/Window.cpp',
|
||||||
'src/Joy.cpp', 'src/Mouse.cpp', 'src/WindowStyle.cpp', 'src/Blend.cpp', 'src/Sound.cpp', \
|
'src/Joy.cpp', 'src/Mouse.cpp', 'src/WindowStyle.cpp', 'src/Blend.cpp', 'src/Sound.cpp',
|
||||||
'src/SoundBuffer.cpp', 'src/Listener.cpp', 'src/SoundRecorder.cpp', 'src/SoundBufferRecorder.cpp', \
|
'src/SoundBuffer.cpp', 'src/Listener.cpp', 'src/SoundRecorder.cpp', 'src/SoundBufferRecorder.cpp',
|
||||||
'src/SoundStream.cpp', 'src/Font.cpp', 'src/Glyph.cpp', 'src/Shape.cpp', 'src/WindowSettings.cpp' ], \
|
'src/SoundStream.cpp', 'src/Font.cpp', 'src/Glyph.cpp', 'src/Shape.cpp', 'src/WindowSettings.cpp'],
|
||||||
libraries=['sfml-graphics', 'sfml-window', 'sfml-audio', 'sfml-system'], \
|
libraries=['sfml-graphics', 'sfml-window', 'sfml-audio', 'sfml-system'],
|
||||||
library_dirs=['../lib/mingw'], \
|
library_dirs=['../lib/mingw'],
|
||||||
include_dirs=['../include']
|
include_dirs=['../include']
|
||||||
)],
|
)],
|
||||||
package_dir = {'PySFML':'PySFML'},
|
package_dir = {'PySFML':'PySFML'},
|
||||||
|
@ -101,5 +101,14 @@ void PySfJoy_InitConst()
|
|||||||
obj = PyLong_FromLong(sf::Joy::AxisPOV);
|
obj = PyLong_FromLong(sf::Joy::AxisPOV);
|
||||||
PyDict_SetItemString(PySfJoyType.tp_dict, "AxisPOV", obj);
|
PyDict_SetItemString(PySfJoyType.tp_dict, "AxisPOV", obj);
|
||||||
Py_DECREF(obj);
|
Py_DECREF(obj);
|
||||||
|
obj = PyLong_FromLong(sf::Joy::Count);
|
||||||
|
PyDict_SetItemString(PySfJoyType.tp_dict, "Count", obj);
|
||||||
|
Py_DECREF(obj);
|
||||||
|
obj = PyLong_FromLong(sf::Joy::AxisCount);
|
||||||
|
PyDict_SetItemString(PySfJoyType.tp_dict, "AxisCount", obj);
|
||||||
|
Py_DECREF(obj);
|
||||||
|
obj = PyLong_FromLong(sf::Joy::ButtonCount);
|
||||||
|
PyDict_SetItemString(PySfJoyType.tp_dict, "ButtonCount", obj);
|
||||||
|
Py_DECREF(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,5 +95,8 @@ void PySfMouse_InitConst()
|
|||||||
obj = PyLong_FromLong(sf::Mouse::XButton2);
|
obj = PyLong_FromLong(sf::Mouse::XButton2);
|
||||||
PyDict_SetItemString(PySfMouseType.tp_dict, "XButton2", obj);
|
PyDict_SetItemString(PySfMouseType.tp_dict, "XButton2", obj);
|
||||||
Py_DECREF(obj);
|
Py_DECREF(obj);
|
||||||
|
obj = PyLong_FromLong(sf::Mouse::ButtonCount);
|
||||||
|
PyDict_SetItemString(PySfMouseType.tp_dict, "ButtonCount", obj);
|
||||||
|
Py_DECREF(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user