diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2005-07-26 11:15:17 +0400 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2005-07-26 11:15:17 +0400 |
| commit | a8ae1c64f4771c88f477dff3ef339becd1d487b5 (patch) | |
| tree | 8375bb7c916dcfaa31689dc2144dbc46f30e67c8 /source/Makefile | |
| parent | a9d7042da9338cc873f600eecbf6ce709a3b8949 (diff) | |
- move libdecimation in link order to keep gnu ld happy
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |