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>2004-07-18 22:42:36 +0400
committerChris Want <cwant@ualberta.ca>2004-07-18 22:42:36 +0400
commit98b86b55fa7d2f90751bfeb5f4dca3c3b30d41ae (patch)
treeb5d9b322a0b108b80cf646394e4a191e6a77b807 /source/Makefile
parent1620a9199e89f13e20086f55521ab91135b66704 (diff)
This makes the windows-gcc build finish (only link to libsolid.a)
... might not be the best way, but it works.
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile
index dd01a940779..c558a374be9 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -109,7 +109,12 @@ ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
- COMLIB += $(NAN_SOLID)/lib/libsolid.a $(NAN_SOLID)/lib/libsolid_broad.a $(NAN_SOLID)/lib/libsolid_complex.a $(NAN_SOLID)/lib/libsolid_convex.a
+ COMLIB += $(NAN_SOLID)/lib/libsolid.a
+ ifneq ($(FREE_WINDOWS), true)
+ COMLIB += $(NAN_SOLID)/lib/libsolid_broad.a
+ COMLIB += $(NAN_SOLID)/lib/libsolid_complex.a
+ COMLIB += $(NAN_SOLID)/lib/libsolid_convex.a
+ endif
COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
COMLIB += $(NAN_QHULL)/lib/libqhull.a