Commits

gamedude  committed 27b6235

Don't use the header's under \epoc32\include to avoid trouble with configuring

  • Participants
  • Parent commits 866e67c
  • Branches symbian_s60

Comments (0)

Files changed (5)

File symbian/BuildPygameRelease.py

     args['sdluid'] = hex(UID_SDL).replace("L","")
     args['jpeguid']= hex(UID_JPEG).replace("L","")
     args['pythoninclude'] = config.pythoninclude
-    
+    args['defines'] = "STDERR_TO_STDOUT"
+    args['winscw_options'] = "-nostderr" # Don't show the stdioserver output
     dobuild(args)
     
     

File symbian/SConscript.SDL.py

                 'deps/SDL/src/video/symbian', 'deps/SDL/src/thread', 
                 'deps/SDL/src/thread/generic', 'deps/SDL/src/thread/symbian', 
                 'deps/SDL/src/timer', 'deps/SDL/src/joystick', 
-                'deps/SDL/symbian/inc', 'deps/SDL/inc/internal']
+                'deps/SDL/symbian/inc', 
+				'deps/SDL/symbian/inc/internal',
+				'deps/SDL/include',
+]
 
-sysincludes = ['deps/SDL/include', '/epoc32/include', 
-               'inc', '/epoc32/include/SDL', 
-               '/epoc32/include/gles', 
-               '/epoc32/include/EGL', 
+sysincludes = [EPOC32_INCLUDE,
+               join( EPOC32_INCLUDE, "gles"),
+               join( EPOC32_INCLUDE, "EGL"),
                C_INCLUDE, 
                ]
 

File symbian/SConscript.app.py

                            "app/pygame_main.cpp"                           
                            ],
                 includes = ["app", "common",
-                            join( EPOC32_INCLUDE, "SDL"), 
+                            join( "deps", "SDL", "include"),                              
+                            join( "deps", "SDL", "symbian", "inc"),
                             C_INCLUDE ] + python_includes
+                            
                 ,
                 defines = [
                     "__LOGMAN_ENABLED__", 

File symbian/SConscript.pygame.py

                              "common",                             
                              join( "deps", "jpeg"),
                              join( "deps", "SDL_image"),
-                             join( EPOC32_INCLUDE, "SDL"),
+                             join( "deps", "SDL_ttf"),
+                             join( "deps", "SDL_mixer"),
+                             join( "deps", "SDL", "include"),                              
+                             join( "deps", "SDL", "symbian", "inc"),
                              C_INCLUDE,                             
                              #join( "..", "..", "tools", "debug" )
                            ],

File symbian/app/pygame_main.cpp

+/** Creates Python interpreter and launches pygame's main script */
+
 #include <sdl.h>
 #include <Python.h>