diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-12-31 08:20:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-12-31 08:20:35 +0300 |
| commit | 58c5fd7066a978af61d8287acaa7722e6de2219b (patch) | |
| tree | e01d7fb6939efbd29941d3c7efd0a6198b073944 /source/blender/windowmanager | |
| parent | d1e836f75c7430e9e9b4b9cabf40e859b6d7fa78 (diff) | |
Added WITH_PYTHON as a cmake option
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 8bbe328c7a3..10830d8d0aa 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -32,13 +32,12 @@ SET(INC . ../blenlib ../makesdna ../makesrna ../blenkernel ../include ../../../intern/bmfont ../imbuf ../render/extern/include ../../../intern/bsp/extern ../radiosity/extern/include - ../../../intern/decimation/extern ../blenloader ../python + ../../../intern/decimation/extern ../blenloader ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue ../quicktime ../../../intern/elbeem/extern ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../nodes ../gpu - ${PYTHON_INC} ${SDL_INC} ) @@ -62,6 +61,12 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(WITH_PYTHON) + SET(INC ${INC} ../python ${PYTHON_INC}) +ELSE(WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(WITH_PYTHON) + IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 500b04eccab..ee6c841bf5a 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -65,7 +65,9 @@ #include "radio.h" +#ifndef DISABLE_PYTHON #include "BPY_extern.h" +#endif #include "SYS_System.h" |