Further fixes to the old makefiles.
[blender.git] / source / blender / src / Makefile
index dc8fde9a77d389e96f6215f59b2653eae3688309..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,10 +56,10 @@ endif
 
 # PreProcessor stuff ------------------------------------------
 
-CPPFLAGS += -I$(OPENGL_HEADERS)
 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
@@ -85,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
@@ -113,3 +113,5 @@ endif
 ifeq ($(INTERNATIONAL), true)
     CPPFLAGS += -DINTERNATIONAL
 endif
+
+CPPFLAGS += -I$(OPENGL_HEADERS)