TLC needed for Makefiles to get gameengine compiling again.
authorKent Mein <mein@cs.umn.edu>
Mon, 25 Aug 2008 19:50:17 +0000 (19:50 +0000)
committerKent Mein <mein@cs.umn.edu>
Mon, 25 Aug 2008 19:50:17 +0000 (19:50 +0000)
Sorry it took me so long to do this :)

Kent

source/Makefile
source/gameengine/Ketsji/Makefile
source/gameengine/Physics/Bullet/Makefile

index d06962cbe3f5e0f339d79ef132e08b49b0641d5f..91dd17d73dd49d211789e65b8e62dc6b26fe674e 100644 (file)
@@ -250,6 +250,7 @@ SPLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
 # but somehow it consistently fails to resolve these symbols... or 
 # can I just not check them? nm claims they aren't...
 SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a
+SPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 
 # These three need to be explicitly mentioned on the cl, because 
 # if they are offered as a lib, they are optimized away. (nzc)
index 47a4855b00c2c6796f5330665786a4c88f742e41..59cc6c8ca7ec1d47f2fcea78924d510ff6e7bf6a 100644 (file)
@@ -38,7 +38,9 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 CPPFLAGS += $(OGL_CPPFLAGS)
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
-CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -I../../blender/python
+CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) 
+CPPFLAGS += -I../../blender/python
+CPPFLAGS += -I../../blender/python/api2_2x
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
 CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include
index 49259d0a67c811f5d6fb2f51393f77a35cde81e1..d5570e7583391fed6d4b7fc884bc6553373f3c09 100644 (file)
@@ -37,5 +37,10 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(NAN_BULLET2)/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I$(NAN_STRING)/include
+CPPFLAGS += -I$(NAN_MOTO)/include
+CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I../../Physics/common
 CPPFLAGS += -I../../Physics/Dummy
+CPPFLAGS += -I../../Rasterizer
+