diff options
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 74 |
1 files changed, 48 insertions, 26 deletions
diff --git a/source/Makefile b/source/Makefile index 8811ab86911..e8ec090255c 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 @@ -82,9 +82,6 @@ GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a 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 @@ -101,11 +98,13 @@ COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a COMLIB += $(NAN_IKSOLVER)/lib/libiksolver.a +COMLIB += $(NAN_MOTO)/lib/libmoto.a COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a COMLIB += $(NAN_JPEG)/lib/libjpeg.a COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a COMLIB += $(NAN_GLEW)/lib/libglew.a +COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a @@ -154,12 +153,12 @@ 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 COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a -COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a ifeq ($(WITH_QUICKTIME), true) COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a @@ -203,18 +202,6 @@ ifeq ($(WITH_FREETYPE2), true) endif endif -ifeq ($(WITH_VERSE), true) - ifeq ($(OS), windows) - ifeq ($(FREE_WINDOWS), true) - COMLIB += $(NAN_VERSE)/lib/libverse.a - else - COMLIB += $(NAN_VERSE)/lib/verse.lib - endif - else - COMLIB += $(NAN_VERSE)/lib/libverse.a - endif -endif - ifeq ($(OS), irix) COMLIB += $(NAN_SDL)/lib/libSDL.a endif @@ -232,11 +219,47 @@ 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_DECIMATION)/lib/libdecimation.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_graph/libed_graph.a +PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a +PULIB += $(OCGDIR)/blender/ed_time/libed_time.a +PULIB += $(OCGDIR)/blender/ed_preview/libed_preview.a +PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a +PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a +PULIB += $(OCGDIR)/blender/ed_object/libed_object.a +PULIB += $(OCGDIR)/blender/ed_curve/libed_curve.a +PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a +PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a +PULIB += $(OCGDIR)/blender/ed_sculpt_paint/libed_sculpt_paint.a +PULIB += $(OCGDIR)/blender/ed_physics/libed_physics.a +PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a +PULIB += $(OCGDIR)/blender/ed_transform/libed_transform.a +PULIB += $(OCGDIR)/blender/ed_util/libed_util.a +PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a +PULIB += $(OCGDIR)/blender/ed_image/libed_image.a +PULIB += $(OCGDIR)/blender/ed_uvedit/libed_uvedit.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 +# note, no idea but it suddenly doesn't compile :( +PULIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a +PULIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a +PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a ifeq ($(NAN_NO_KETSJI),true) PULIB += $(NAN_MOTO)/lib/libmoto.a @@ -251,13 +274,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) @@ -514,13 +536,13 @@ ifeq ($(OS),windows) endif endif -$(DIR)/$(DEBUG_DIR)bin/blenderstatic: $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) +$(DIR)/$(DEBUG_DIR)bin/blenderstatic: $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) @echo "****> Link $@" ifdef NAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(SADD) $(LOPTS) + $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) $(LLIBS) $(SADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif @@ -528,13 +550,13 @@ ifeq ($(OS), darwin) @$(MAKE) -C darwin/ APPLICATION=blenderstatic endif -$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) +$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) @echo "****> Link $@" ifdef NAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(DADD) $(LOPTS) + $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) $(LLIBS) $(DADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif |