Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2008-01-30 00:01:12 +0300
committerDaniel Genrich <daniel.genrich@gmx.net>2008-01-30 00:01:12 +0300
commit77685023caaee092a4c1ed4a3da13ff67861a962 (patch)
tree6a516a1ef9deebed5d38586be310c00f0d01484f /source/Makefile
parent3a3fe8a4805ca0f1db0eec3cca18e1c70b765080 (diff)
Initial commit of cloth modifier from branch rev 13453
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile
index 3553c723b51..5c72940d9a2 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -151,9 +151,11 @@ ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/ketsji/KXNetwork/$(DEBUG_DIR)libKXNetwork.a
COMLIB += $(OCGDIR)/gameengine/Network/$(DEBUG_DIR)libNetwork.a
COMLIB += $(OCGDIR)/gameengine/Network/LoopBackNetwork/$(DEBUG_DIR)libLoopBackNetwork.a
- COMLIB += $(NAN_BULLET2)/lib/libbullet2.a
endif
+# Required by cloth, not gameengine only anymore
+COMLIB += $(NAN_BULLET2)/lib/$(DEBUG_DIR)libbullet2.a
+
COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a
COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a