kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Makefile support for solid -- assumes solid and qhull are in the lib

Browse Source 
dir, i.e., ../lib/your_platform/{solid|qhull}.
This commit is contained in:
Chris Want 2004-03-28 21:56:00 +00:00
parent 9206a1eba6
commit 2cd00774cd
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Makefile
View File

@ -106,10 +106,12 @@ ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
COMLIB += $(NAN_ODE)/lib/libode.a COMLIB += $(NAN_SOLID)/lib/libsolid.a
# COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
COMLIB += $(NAN_QHULL)/lib/libqhull.a
COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
# COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a # COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a

4
source/nan_compile.mk
View File

@ -38,7 +38,9 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
# common parts --------------------------------------------------- # common parts ---------------------------------------------------
# Uncomment next line to enable integrated game engine # Uncomment next line to enable integrated game engine
#CFLAGS += -DGAMEBLENDER=1 CFLAGS += -DGAMEBLENDER=1
CFLAGS += -DUSE_SUMO_SOLID
CCFLAGS += -DUSE_SUMO_SOLID
ifdef NAN_DEBUG ifdef NAN_DEBUG
CFLAGS += $(NAN_DEBUG) CFLAGS += $(NAN_DEBUG)

8
source/nan_definitions.mk
View File

@ -58,7 +58,13 @@ all debug::
# Object Config_Guess DIRectory # Object Config_Guess DIRectory
export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS) export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
export NAN_MOTO ?= $(LCGDIR)/moto export NAN_MOTO ?= $(LCGDIR)/moto
export NAN_SOLID ?= $(SRCHOME)/sumo/SOLID-3.0 ifeq ($(FREE_WINDOWS), true)
export NAN_SOLID ?= $(LCGDIR)/gcc/solid
export NAN_QHULL ?= $(LCGDIR)/gcc/qhull
else
export NAN_SOLID ?= $(LCGDIR)/solid
export NAN_QHULL ?= $(LCGDIR)/qhull
endif
export NAN_SUMO ?= $(SRCHOME)/gameengine/Physics/Sumo export NAN_SUMO ?= $(SRCHOME)/gameengine/Physics/Sumo
export NAN_FUZZICS ?= $(SRCHOME)/gameengine/Physics/Sumo/Fuzzics export NAN_FUZZICS ?= $(SRCHOME)/gameengine/Physics/Sumo/Fuzzics
export NAN_BLENKEY ?= $(LCGDIR)/blenkey export NAN_BLENKEY ?= $(LCGDIR)/blenkey