diff options
author | Chris Want <cwant@ualberta.ca> | 2004-07-19 06:43:07 +0400 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2004-07-19 06:43:07 +0400 |
commit | 6883efe712d5c29239372849295332b7aaa30584 (patch) | |
tree | bf3c1e1b8f70dbe9508764fc303265a63d265979 | |
parent | b42c714d75a2bb1eacb71657ecbd996179b24038 (diff) |
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).
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | source/Makefile | 8 |
2 files changed, 4 insertions, 6 deletions
@@ -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 diff --git a/source/Makefile b/source/Makefile index c558a374be9..c4e8140818a 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 |