Further fixes to the old makefiles.
[blender.git] / source / blender / src / Makefile
index 38d28469af34e30471c1001a18aaac514e1a6449..be76b28da29a13a0339d70da9cab5e845070353c 100644 (file)
@@ -36,12 +36,12 @@ LIBNAME ?= $(ORGLIBNAME)
 DIR ?= $(OCGDIR)/blender/$(ORGLIBNAME)
 
 CSRCS ?= $(wildcard *.c)
-PUB_CSRCS ?= $(CSRCS) $(wildcard pub/*.c)
+PUB_CSRCS ?= $(CSRCS)
 CRE_CSRCS ?= $(CSRCS) $(wildcard cre/*.c)
 
 OBJS = $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)DNA.o
 
-ALLTARGETS = creator publisher
+ALLTARGETS = publisher
 
 include nan_compile.mk
 
@@ -56,14 +56,10 @@ endif
 
 # PreProcessor stuff ------------------------------------------
 
-CPPFLAGS += -I$(OPENGL_HEADERS)
-ifeq ($(OS),$(findstring $(OS), "freebsd"))
-    CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
-else
-    CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
-endif
+CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 CPPFLAGS += -I$(NAN_GHOST)/include
 CPPFLAGS += -I$(NAN_BMFONT)/include
+CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 
 # External interfaces of modules:
 CPPFLAGS += -I../render/extern/include
@@ -75,10 +71,10 @@ CPPFLAGS += -I../makesdna
 CPPFLAGS += -I../imbuf
 CPPFLAGS += -I../img
 CPPFLAGS += -I../blenloader
-CPPFLAGS += -I../verify
 CPPFLAGS += -I..
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../../gameengine/SoundSystem
+CPPFLAGS += -I../ftfont
 
 # Only used by py_demo.c !!!
 CPPFLAGS += -I../radiosity/extern/include
@@ -89,9 +85,9 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I$(NAN_DECIMATION)/include
 CPPFLAGS += -I$(NAN_BSP)/include
 
-CPPFLAGS += -I$(NAN_BLENKEY)/include
 CPPFLAGS += -I../readstreamglue
 CPPFLAGS += -I../include
+CPPFLAGS += -I$(NAN_SDL)/include/SDL
 
 ifdef NAN_BUILDINFO
     CPPFLAGS += -DNAN_BUILDINFO
@@ -108,3 +104,14 @@ ifeq ($(OS),linux)
        CPPFLAGS += -I/usr/src/MesaCVS/include
     endif
 endif
+
+ifeq ($(WITH_QUICKTIME),true)
+       CPPFLAGS += -I../quicktime
+       CPPFLAGS += -DWITH_QUICKTIME
+endif
+
+ifeq ($(INTERNATIONAL), true)
+    CPPFLAGS += -DINTERNATIONAL
+endif
+
+CPPFLAGS += -I$(OPENGL_HEADERS)