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:
authorChris Want <cwant@ualberta.ca>2005-08-18 10:07:02 +0400
committerChris Want <cwant@ualberta.ca>2005-08-18 10:07:02 +0400
commit4a50f5b5930bcaadda1bde13f3abcc9780b7250b (patch)
tree4d3eca2325ba55daeb2b47db7a873adb56b50b0d /source/Makefile
parentf7914a224839a9f3509bf391b16dd1a7669438ae (diff)
Support for 'Bullet' in the Makefiles. Enable with:
export NAN_USE_BULLET=true in environment, or in user-def.mk
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile
index 4a1ca663e41..83726144864 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -125,6 +125,9 @@ ifneq ($(NAN_NO_KETSJI),true)
# COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
# COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
+ ifeq ($(NAN_USE_BULLET), true)
+ COMLIB += $(OCGDIR)/gameengine/blphys/blbullet/$(DEBUG_DIR)libblbullet.a
+ endif
COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
# COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
@@ -144,6 +147,10 @@ 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
+ ifeq ($(NAN_USE_BULLET), true)
+ COMLIB += $(NAN_BULLET)/lib/libbulletdyn.a
+ COMLIB += $(NAN_BULLET)/lib/libbullet.a
+ endif
endif
COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a