Author: dmeyer
Date: Fri Mar 10 13:32:21 2006
New Revision: 1262
Removed:
trunk/display/src/sdl.h
Modified:
trunk/display/setup.py
trunk/display/src/sdl.c
Log:
sdl/pygame fixes
Modified: trunk/display/setup.py
==============================================================================
--- trunk/display/setup.py (original)
+++ trunk/display/setup.py Fri Mar 10 13:32:21 2006
@@ -65,11 +65,11 @@
print 'ok'
check_library('sdl', '1.2.5')
- has_pygame = True
+ pygame = inc
except ImportError, e:
print 'not installed'
- has_pygame = False
+ pygame = False
evas_engines = []
@@ -166,12 +166,13 @@
print "- DirectFB"
-if has_pygame and get_library('sdl') and get_library('imlib2'):
+if pygame and get_library('sdl') and get_library('imlib2'):
# pygame module
sdl = Extension('kaa.display._SDLmodule', ['src/sdl.c'])
sdl.add_library('imlib2')
sdl.add_library('sdl')
+ sdl.include_dirs.append(pygame)
sdl.build()
print "+ SDL (imlib2)"
else:
Modified: trunk/display/src/sdl.c
==============================================================================
--- trunk/display/src/sdl.c (original)
+++ trunk/display/src/sdl.c Fri Mar 10 13:32:21 2006
@@ -30,11 +30,12 @@
* ----------------------------------------------------------------------------
*/
+#include <pygame.h>
+
#include "config.h"
#include <Python.h>
#include "imlib2.h"
-#include <pygame.h>
PyObject *image_to_surface(PyObject *self, PyObject *args)
{
@@ -92,7 +93,7 @@
{
void **imlib2_api_ptrs;
- Py_InitModule("_SDL", display_methods);
+ Py_InitModule("_SDL", sdl_methods);
// Import kaa-imlib2's C api
imlib2_api_ptrs = get_module_api("kaa.imlib2._Imlib2");
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
