tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Further fixes to the old makefiles. 

Kent
This commit is contained in:
Kent Mein 2003-07-16 19:53:53 +00:00
parent 899a12a5cb
commit 6dcc5b030e
12 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/SoundSystem/Makefile
View File

@ -35,7 +35,7 @@ include nan_definitions.mk
LIBNAME = soundsystem
SOURCEDIR = intern/SoundSystem
DIR = $(OCGDIR)/SoundSystem
DIR = $(OCGDIR)/$(SOURCEDIR)
DIRS = intern
DIRS += dummy
@ -68,6 +68,6 @@ ifeq ($(OS),darwin)
ranlib $(NAN_SOUNDSYSTEM)/lib/libsoundsystem.a
ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libsoundsystem.a
endif
@../tools/cpifdiff.sh extern/*.h $(NAN_SOUNDSYSTEM)/include/
@../tools/cpifdiff.sh *.h $(NAN_SOUNDSYSTEM)/include/

7
intern/SoundSystem/SND_test/Makefile
View File

@ -31,8 +31,8 @@
#
#
LIBNAME = SoundSystem
DIR = $(OCGDIR)/intern/$(LIBNAME)
LIBNAME = soundsystem
DIR = $(OCGDIR)/intern/SoundSystem
ALLTARGETS = $(OBJS) $(DIR)/$(DEBUG_DIR)SoundSystem
include nan_compile.mk
@ -44,8 +44,7 @@ CPPFLAGS += -I.. -I../SND_BlenderWaveCache -I../SND_OpenAL
TESTLIB = $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
TESTLIB += $(OCGDIR)/gameengine/BlenderWaveCache/$(DEBUG_DIR)libBlenderWaveCache.a
TESTLIB += $(OCGDIR)/kernel/gen_system/$(DEBUG_DIR)libgen_system.a
TESTLIB += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
TESTLIB += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libsoundsystem.a
TESTLIB += $(NAN_OPENAL)/lib/libopenal.a
$(DIR)/$(DEBUG_DIR)SoundSystem: $(OBJS) $(TESTLIB)

4
intern/SoundSystem/intern/Makefile
View File

@ -31,8 +31,8 @@
#
#
LIBNAME = SoundSystem
DIR = $(OCGDIR)/intern/$(LIBNAME)
LIBNAME = soundsystem
DIR = $(OCGDIR)/intern/SoundSystem
include nan_compile.mk

1
source/blender/src/Makefile
View File

@ -59,6 +59,7 @@ endif
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_GHOST)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
# External interfaces of modules:
CPPFLAGS += -I../render/extern/include

2
source/gameengine/BlenderRoutines/Makefile
View File

@ -44,6 +44,7 @@ CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
CPPFLAGS += -I$(NAN_FUZZICS)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
# because of kernel dependency on makesdna
CPPFLAGS += -I../../blender/makesdna
CPPFLAGS += -I../../blender/include
@ -61,7 +62,6 @@ CPPFLAGS += -I../Ketsji
CPPFLAGS += -I../Rasterizer
CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer
CPPFLAGS += -I../SceneGraph
CPPFLAGS += -I../SoundSystem
CPPFLAGS += -I../../kernel/gen_system
CPPFLAGS += -I../Network
CPPFLAGS += -I../Network/LoopBackNetwork

3
source/gameengine/Converter/Makefile
View File

@ -40,6 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I../../blender
@ -51,7 +52,7 @@ CPPFLAGS += -I../../blender/blenlib
CPPFLAGS += -I../../blender/blenkernel
CPPFLAGS += -I../../blender/render/extern/include
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic -I../SoundSystem
CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic
CPPFLAGS += -I../Ketsji -I../BlenderRoutines -I../SceneGraph
CPPFLAGS += -I../../kernel/gen_system
CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer

2
source/gameengine/GamePlayer/common/Makefile
View File

@ -55,6 +55,7 @@ CPPFLAGS += -I$(NAN_SUMO)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_BMFONT)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I../../../gameengine/Converter
CPPFLAGS += -I../../../gameengine/Expressions
CPPFLAGS += -I../../../gameengine/GameLogic
@ -65,7 +66,6 @@ CPPFLAGS += -I../../../gameengine/Network
CPPFLAGS += -I../../../gameengine/Network/LoopBackNetwork
CPPFLAGS += -I../../../gameengine/Rasterizer
CPPFLAGS += -I../../../gameengine/SceneGraph
CPPFLAGS += -I../../../gameengine/SoundSystem
CPPFLAGS += -I../../../gameengine/Rasterizer/RAS_OpenGLRasterizer
###############################

8
source/gameengine/GamePlayer/common/unix/Makefile
View File

@ -57,16 +57,10 @@ CPPFLAGS += -I../../../../gameengine/Network/LoopBackNetwork
CPPFLAGS += -I../../../../gameengine/Rasterizer
CPPFLAGS += -I../../../../gameengine/Rasterizer/RAS_OpenGLRasterizer
CPPFLAGS += -I../../../../gameengine/SceneGraph
ifeq ($(NAN_SND), OPENAL)
CPPFLAGS += -I../../../../gameengine/SoundSystem
CPPFLAGS += -I../../../../gameengine/SoundSystem/SND_OpenAL
else
CPPFLAGS += -I../../../../gameengine/SoundSystem
CPPFLAGS += -I../../../../gameengine/SoundSystem/SND_Dummy
endif
CPPFLAGS += -I$(NAN_FUZZICS)/include
CPPFLAGS += -I$(NAN_SUMO)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_BMFONT)/include

2
source/gameengine/GamePlayer/common/windows/Makefile
View File

@ -43,7 +43,6 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(SRCHOME)/gameengine/GameLogic
CPPFLAGS += -I$(SRCHOME)/gameengine/Rasterizer
CPPFLAGS += -I$(SRCHOME)/gameengine/Ketsji
CPPFLAGS += -I$(SRCHOME)/gameengine/SoundSystem
CPPFLAGS += -I$(SRCHOME)/gameengine/Network
CPPFLAGS += -I$(SRCHOME)/gameengine/Network/LoopBackNetwork
@ -53,6 +52,7 @@ CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include
CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
# Blender stuff
CPPFLAGS += -I$(SRCHOME)/blender/blenkernel

3
source/gameengine/GamePlayer/ghost/Makefile
View File

@ -42,6 +42,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I../../GamePlayer/common
@ -56,8 +57,6 @@ CPPFLAGS += -I../../Network/LoopBackNetwork
CPPFLAGS += -I../../Rasterizer
CPPFLAGS += -I../../Rasterizer/RAS_OpenGLRasterizer
CPPFLAGS += -I../../SceneGraph
CPPFLAGS += -I../../SoundSystem
CPPFLAGS += -I../../SoundSystem/SND_OpenAL
# Sumo
CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include

3
source/gameengine/Ketsji/Makefile
View File

@ -41,9 +41,10 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += $(OGL_CPPFLAGS)
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph
CPPFLAGS += -I../BlenderRoutines -I../SoundSystem -I../Expressions
CPPFLAGS += -I../BlenderRoutines -I../Expressions
CPPFLAGS += -I../../kernel/gen_system
CPPFLAGS += -I../Network -IKXNetwork
CPPFLAGS += -I../Physics/common

5
source/gameengine/Physics/common/Makefile
View File

@ -39,7 +39,8 @@ include nan_compile.mk
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
@ -51,7 +52,7 @@ CPPFLAGS += -I../../blender/blenlib
CPPFLAGS += -I../../blender/blenkernel
CPPFLAGS += -I../../blender/render/extern/include
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic -I../SoundSystem
CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic
CPPFLAGS += -I../Ketsji -I../BlenderRoutines -I../SceneGraph
CPPFLAGS += -I../../kernel/gen_system
CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer