diff options
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 49 |
1 files changed, 39 insertions, 10 deletions
diff --git a/source/Makefile b/source/Makefile index 662cb1df0a6..fe48b26c14c 100644 --- a/source/Makefile +++ b/source/Makefile @@ -74,7 +74,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/windowmanager/$(DEBUG_DIR)libwindowmanager.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 @@ -84,7 +84,6 @@ 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 # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some @@ -156,6 +155,7 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(NAN_BULLET2)/lib/libbullet2.a endif +COMLIB += $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)libdna.a COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a @@ -194,7 +194,7 @@ ifeq ($(WITH_FREETYPE2), true) else COMLIB += $(NAN_FTGL)/lib/libftgl.a ifeq ($(OS), irix) - COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a else COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a endif @@ -230,10 +230,33 @@ ifeq ($(WITH_OPENEXR), true) COMLIB += $(NAN_OPENEXR_LIBS) endif +# note: space_api.a in begin of editors, screen.a in end 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/ed_space/libed_space.a +PULIB += $(OCGDIR)/blender/ed_sound/libed_sound.a +PULIB += $(OCGDIR)/blender/ed_action/libed_action.a +PULIB += $(OCGDIR)/blender/ed_nla/libed_nla.a +PULIB += $(OCGDIR)/blender/ed_script/libed_script.a +PULIB += $(OCGDIR)/blender/ed_text/libed_text.a +PULIB += $(OCGDIR)/blender/ed_sequencer/libed_sequencer.a +PULIB += $(OCGDIR)/blender/ed_file/libed_file.a +PULIB += $(OCGDIR)/blender/ed_info/libed_info.a +PULIB += $(OCGDIR)/blender/ed_buttons/libed_buttons.a +PULIB += $(OCGDIR)/blender/ed_node/libed_node.a +PULIB += $(OCGDIR)/blender/ed_image/libed_image.a +PULIB += $(OCGDIR)/blender/ed_ipo/libed_ipo.a +PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a +PULIB += $(OCGDIR)/blender/ed_time/libed_time.a +PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a +PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a +PULIB += $(OCGDIR)/blender/ed_util/libed_util.a +PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a +PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a +PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a +PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a +PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a ifeq ($(NAN_NO_KETSJI),true) PULIB += $(NAN_MOTO)/lib/libmoto.a @@ -248,13 +271,12 @@ SPLIB1 += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a SPLIB1 += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a SPLIB1 += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a -SPLIB = $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)DNA.o -SPLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a +SPLIB = $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a # this is used for the plugin. It uses some things from libz.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 +SPLIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a # These three need to be explicitly mentioned on the cl, because # if they are offered as a lib, they are optimized away. (nzc) @@ -395,9 +417,16 @@ else NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else - NAN_SND_LIBS = $(SOUNDSYSTEM) - NAN_SND_LIBS += $(DUMMYSOUND) - NAN_SND_LIBS += $(SOUNDSYSTEM) + ifeq ($(OS), irix) + NAN_SND_LIBS = $(SOUNDSYSTEM) + NAN_SND_LIBS += $(DUMMYSOUND) + NAN_SND_LIBS += $(SDLSOUND) + NAN_SND_LIBS += $(SOUNDSYSTEM) + else + NAN_SND_LIBS = $(SOUNDSYSTEM) + NAN_SND_LIBS += $(DUMMYSOUND) + NAN_SND_LIBS += $(SOUNDSYSTEM) + endif endif endif endif |