Two in one:
[blender.git] / source / blender / src / Makefile
index f89f8965fd530b34028d453bb5b4c97d71d63194..cb6c19548128d1a550e850c83fa3b0065ce6723b 100644 (file)
@@ -64,13 +64,11 @@ CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include $(NAN_SDLCFLAGS)
 
 # External interfaces of modules:
 CPPFLAGS += -I../render/extern/include
-CPPFLAGS += -I../renderconverter
 CPPFLAGS += -I../blenkernel
 CPPFLAGS += -I../blenlib
 CPPFLAGS += -I../python
 CPPFLAGS += -I../makesdna
 CPPFLAGS += -I../imbuf
-CPPFLAGS += -I../img
 CPPFLAGS += -I../blenloader
 CPPFLAGS += -I..
 CPPFLAGS += -I../../kernel/gen_system
@@ -82,10 +80,10 @@ CPPFLAGS += -I../radiosity/extern/include
 
 CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I$(NAN_MEMUTIL)/include
 
 CPPFLAGS += -I$(NAN_DECIMATION)/include
 CPPFLAGS += -I$(NAN_BSP)/include
-
 CPPFLAGS += -I$(NAN_OPENNL)/include
 
 CPPFLAGS += -I../readstreamglue
@@ -112,6 +110,16 @@ ifeq ($(WITH_QUICKTIME),true)
        CPPFLAGS += -DWITH_QUICKTIME
 endif
 
+ifeq ($(WITH_ICONV), true)
+       CPPFLAGS += -DWITH_ICONV
+       CPPFLAGS += $(NAN_ICONV_INC)
+endif
+
+ifeq ($(WITH_FFMPEG),true)
+        CPPFLAGS += -DWITH_FFMPEG
+        CPPFLAGS += $(NAN_FFMPEGCFLAGS)
+endif
+
 ifeq ($(WITH_OPENEXR),true)
        CPPFLAGS += -DWITH_OPENEXR
 endif
@@ -120,6 +128,15 @@ ifeq ($(INTERNATIONAL), true)
     CPPFLAGS += -DINTERNATIONAL
 endif
 
+ifeq ($(WITH_VERSE), true)
+   CPPFLAGS += -DWITH_VERSE
+   CPPFLAGS += -I$(NAN_VERSE)/include
+   # print some other debug information
+   ifeq ($(VERSE_DEBUG_PRINT), true)
+       CPPFLAGS += -DVERSE_DEBUG_PRINT
+   endif
+endif
+
 ifeq ($(NAN_TWEAK_MODE), true)
     CPPFLAGS += -DTWEAK_MODE
 endif