diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 06:44:24 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 06:44:24 +0400 |
| commit | a57cd82e9fd7676de9711838c3181f0e59babf5a (patch) | |
| tree | 5e295a39b849e741ed28437d52a0fbb4999de254 /source/Makefile | |
| parent | d5585a35896c0693bf0b443ab8a210a71e6d5efc (diff) | |
Remove all the autoconf stuff for QHull & SOLID and use the Makefiles.
This should make building Solid & Qhull much more reliable.
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/Makefile b/source/Makefile index ccf4bb53043..dd01a940779 100644 --- a/source/Makefile +++ b/source/Makefile @@ -109,7 +109,7 @@ 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 + 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 += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a COMLIB += $(NAN_QHULL)/lib/libqhull.a @@ -313,12 +313,12 @@ ifeq ($(OS),linux) BINTARGETS += blenderplayer endif ifeq ($(CPU),i386) - BINTARGETS = plugin - # BINTARGETS += ptest - BINTARGETS += xplink - BINTARGETS += blenderdynamic + BINTARGETS = blenderdynamic BINTARGETS += blenderplayer BINTARGETS += blenderstatic + ifneq ($(NAN_NO_PLUGIN),true) + BINTARGETS += plugin xplink + endif endif ifeq ($(CPU),powerpc) BINTARGETS = blenderdynamic @@ -413,7 +413,7 @@ ifeq ($(OS),windows) ifeq ($(FREE_WINDOWS),true) PYLIB = $(NAN_PYTHON)/lib/freepy.a else - PYLIB = $(NAN_PYTHON)/lib/python22.lib + PYLIB = $(NAN_PYTHON)/lib/python23.lib endif PYPLAYERLIB = $(NAN_PYTHON)/static/*.obj |