From a8ae1c64f4771c88f477dff3ef339becd1d487b5 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 26 Jul 2005 07:15:17 +0000 Subject: - move libdecimation in link order to keep gnu ld happy --- source/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/Makefile b/source/Makefile index c853092f2b9..4a1ca663e41 100644 --- a/source/Makefile +++ b/source/Makefile @@ -78,7 +78,6 @@ PYPLAYERLIB ?= $(PYLIB) GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a - GRPLIB += $(NAN_DECIMATION)/lib/libdecimation.a GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a @@ -98,6 +97,7 @@ PYPLAYERLIB ?= $(PYLIB) # to properly resolve circular dependencies. ugly, but it works... # the repeat entries could probably be trimmed down. COMLIB = $(OCGDIR)/blender/blenkernel/$(DEBUG_DIR)libblenkernel.a + COMLIB += $(NAN_DECIMATION)/lib/libdecimation.a COMLIB += $(OCGDIR)/blender/blenloader/$(DEBUG_DIR)libblenloader.a COMLIB += $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a -- cgit v1.2.3