diff options
| author | Kent Mein <mein@cs.umn.edu> | 2007-12-27 22:49:22 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2007-12-27 22:49:22 +0300 |
| commit | 1be207fe08d5d4d867b4e1356a5687df7a54f86b (patch) | |
| tree | 1159c0600edf8c9b1711e726c84d57c241ac29af | |
| parent | 25135a201b32f4c579758bfdd33fab36c0b12a7c (diff) | |
Small tweaks to blender2.5 Makefiles...
commented out srclib and pythonlib since its not there
added new include dir for window stuff so things could find headers..
Kent
| -rw-r--r-- | source/Makefile | 6 | ||||
| -rw-r--r-- | source/creator/Makefile | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/Makefile b/source/Makefile index ff5c6d5551e..9b1f35c19b8 100644 --- a/source/Makefile +++ b/source/Makefile @@ -77,7 +77,7 @@ endif # Note: the order is important here GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a -GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a +#GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a GRPLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a @@ -87,7 +87,7 @@ GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a -GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a +#GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some @@ -226,7 +226,7 @@ PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a PULIB += $(NAN_MOTO)/lib/libmoto.a PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a -PULIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a +#PULIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a ifeq ($(NAN_NO_KETSJI),true) PULIB += $(NAN_MOTO)/lib/libmoto.a diff --git a/source/creator/Makefile b/source/creator/Makefile index 02c22aa4da8..8e0afca828b 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -51,6 +51,7 @@ CPPFLAGS += -I../blender/renderconverter CPPFLAGS += -I../blender/blenkernel CPPFLAGS += -I../blender/python CPPFLAGS += -I../blender/blenloader +CPPFLAGS += -I../blender/windowmanager CPPFLAGS += -I../kernel/gen_system CPPFLAGS += -I../kernel/gen_messaging CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include |