This makes the windows-gcc build finish (only link to libsolid.a)
authorChris Want <cwant@ualberta.ca>
Sun, 18 Jul 2004 18:42:36 +0000 (18:42 +0000)
committerChris Want <cwant@ualberta.ca>
Sun, 18 Jul 2004 18:42:36 +0000 (18:42 +0000)
... might not be the best way, but it works.

source/Makefile

index dd01a94077938fcdcf64d99a5b81ad4bde9351fe..c558a374be916af386f935773173ce2f9c4ca82b 100644 (file)
@@ -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