windows-gcc vs. solid, round 2
authorChris Want <cwant@ualberta.ca>
Mon, 19 Jul 2004 02:43:07 +0000 (02:43 +0000)
committerChris Want <cwant@ualberta.ca>
Mon, 19 Jul 2004 02:43:07 +0000 (02:43 +0000)
Doing it the Kester way, but in a way that it actually compiles and links
for non-Kester people. >=P

(translation: FREE_WINDOWS now builds the stuff in extern and overwrites
the pre-compiled solid libs).

Makefile
source/Makefile

index e3758ce55f00b43ed6b450b3f1757d0f3ab34702..8cca8f2a6d112006572995947f1fa0797d50571d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
 
 SOURCEDIR = blender
 ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= dlltool intern source po
+    DIRS ?= dlltool extern intern source po
 endif
 
 DIRS ?= extern intern source po
index c558a374be916af386f935773173ce2f9c4ca82b..c4e8140818a0749886e8340e7e41904e37516d77 100644 (file)
@@ -110,11 +110,9 @@ ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
     COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.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 += $(NAN_SOLID)/lib/libsolid_broad.a 
+    COMLIB += $(NAN_SOLID)/lib/libsolid_complex.a
+    COMLIB += $(NAN_SOLID)/lib/libsolid_convex.a
     COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
     COMLIB += $(NAN_QHULL)/lib/libqhull.a