windows-gcc vs. solid, round 2

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).
This commit is contained in:
Chris Want
2004-07-19 02:43:07 +00:00
parent b42c714d75
commit 6883efe712
2 changed files with 4 additions and 6 deletions
+1 -1
View File
@@ -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
+3 -5
View 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