Merge with -r 22620:23107.
[blender.git] / source / blender / editors / CMakeLists.txt
index 22e1286d2989c48c0311d241989986fd4756f3ea..066d42e723ee7fe094132a0e18788167f1e5dd90 100644 (file)
 FILE(GLOB SRC */*.c)
 
 SET(INC ../windowmanager
-  ../editors/include
-  ../../../intern/guardedalloc ../../../intern/memutil
-  ../blenlib ../makesdna ../makesrna ../blenkernel
-  ../include ../../../intern/bmfont ../imbuf ../render/extern/include
-  ../../../intern/bsp/extern ../radiosity/extern/include
-  ../../../intern/decimation/extern ../blenloader ../python
-  ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
-  ../quicktime ../../../intern/elbeem/extern
-  ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
-  ../nodes
-  ../gpu
-  ${PYTHON_INC}
-  ${SDL_INC}
+       ../editors/include
+       ../../../intern/guardedalloc ../../../intern/memutil
+       ../blenlib ../makesdna ../makesrna ../blenkernel
+       ../include ../imbuf ../render/extern/include
+       ../../../intern/bsp/extern
+       ../../../intern/decimation/extern ../blenloader ../python
+       ../../kernel/gen_system ../readstreamglue
+       ../../../intern/elbeem/extern
+       ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern
+       ../../../intern/audaspace/intern
+       ../nodes
+       ../gpu
+       ../blenfont
 )
 
+IF(WITH_GAMEENGINE)
+       ADD_DEFINITIONS(-DGAMEBLENDER)
+ENDIF(WITH_GAMEENGINE)
+
 IF(WITH_INTERNATIONAL)
-  SET(INC ${INC} ../ftfont)
-  ADD_DEFINITIONS(-DINTERNATIONAL)
-  ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
+       ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
 IF(WITH_OPENEXR)
-  ADD_DEFINITIONS(-DWITH_OPENEXR)
+       ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
+IF(WITH_OPENJPEG)
+       ADD_DEFINITIONS(-DWITH_OPENJPEG)
+ENDIF(WITH_OPENJPEG)
+
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
-  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-  SET(INC ${INC} ${FFMPEG_INC})
-  ADD_DEFINITIONS(-DWITH_FFMPEG)
+       SET(INC ${INC} ${FFMPEG_INC})
+       ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
+IF(NOT WITH_ELBEEM)
+       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
+
+IF(WITH_PYTHON)
+       SET(INC ${INC} ${PYTHON_INC})
+ELSE(WITH_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
 IF(WIN32)
-  SET(INC ${INC} ${PTHREADS_INC})
+       SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
-IF(WITH_VERSE)
-  SET(INC ${INC} ${VERSE_INC})
-  ADD_DEFINITIONS(-DWITH_VERSE)
-ENDIF(WITH_VERSE)
-
 # TODO buildinfo
 IF(BF_BUILDINFO)
-  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+       ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(BF_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
 
-IF(WITH_VERSE)
-  ADD_DEPENDENCIES(bf_editors mkprot verse)
-ENDIF(WITH_VERSE)
-