diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-20 14:24:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-20 14:24:53 +0400 |
| commit | 4d0a6fee4af4be5877d2a69321913ad39039b76b (patch) | |
| tree | b8d233dee4020746ba3703a589a3262da2d2c9de /source/gameengine | |
| parent | b76009232eea8d299fa2bec52c44dc76872705fb (diff) | |
cmake option to disable SDL,
bpy_interface.c - change order of checking scripts to avoid calling stat on .py files.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/GameLogic/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 21 |
2 files changed, 12 insertions, 16 deletions
diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt index 7e2bc85bd1f..530664dce55 100644 --- a/source/gameengine/GameLogic/CMakeLists.txt +++ b/source/gameengine/GameLogic/CMakeLists.txt @@ -35,8 +35,13 @@ SET(INC ../../../intern/moto/include ../../../source/gameengine/Rasterizer ${PYTHON_INC} - ${SDL_INC} ) +IF(WITH_SDL) + SET(INC ${INC} ${SDL_INC}) +ELSE(WITH_SDL) + ADD_DEFINITIONS(-DDISABLE_SDL) +ENDIF(WITH_SDL) + BLENDERLIB(bf_logic "${SRC}" "${INC}") #env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 110] ) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index ee1ff2c6502..f703841c40b 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -26,20 +26,6 @@ FILE(GLOB SRC *.cpp) -#XXX disabled for 2.5 because of missing python -#SET(SRC -# ${SRC} -# ../../../source/blender/python/api2_2x/Mathutils.c -# ../../../source/blender/python/api2_2x/Geometry.c -# ../../../source/blender/python/api2_2x/constant.c -# ../../../source/blender/python/api2_2x/euler.c -# ../../../source/blender/python/api2_2x/matrix.c -# ../../../source/blender/python/api2_2x/quat.c -# ../../../source/blender/python/api2_2x/vector.c -# ../../../source/blender/python/api2_2x/bpy_internal_import.c -# ../../../source/blender/python/api2_2x/BGL.c -#) - SET(INC . ../../../source/kernel/gen_system @@ -77,8 +63,13 @@ SET(INC ../../../extern/solid ../../../extern/glew/include ${PYTHON_INC} - ${SDL_INC} ) +IF(WITH_SDL) + SET(INC ${INC} ${SDL_INC}) +ELSE(WITH_SDL) + ADD_DEFINITIONS(-DDISABLE_SDL) +ENDIF(WITH_SDL) + BLENDERLIB(bf_ketsji "${SRC}" "${INC}") #env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags ) |