forked from bartvdbraak/blender
Changed some occurances of the lib 'soundsystem' to 'SoundSystem'
(seems half of the references were one way, the other half were the other way). Also made irix link to $(OCGDIR)/intern/*SoundSystem/* instead of $(OCGDIR)/gameengine/*SoundSystem/*
This commit is contained in:
parent
68b3cfbbe5
commit
ae512b137c
@ -33,7 +33,7 @@
|
||||
|
||||
include nan_definitions.mk
|
||||
|
||||
LIBNAME = soundsystem
|
||||
LIBNAME = SoundSystem
|
||||
SOURCEDIR = intern/SoundSystem
|
||||
DIR = $(OCGDIR)/$(SOURCEDIR)
|
||||
DIRS = intern
|
||||
@ -62,11 +62,11 @@ install: all debug
|
||||
@[ -d $(NAN_SOUNDSYSTEM)/include ] || mkdir $(NAN_SOUNDSYSTEM)/include
|
||||
@[ -d $(NAN_SOUNDSYSTEM)/lib ] || mkdir $(NAN_SOUNDSYSTEM)/lib
|
||||
@[ -d $(NAN_SOUNDSYSTEM)/lib/debug ] || mkdir $(NAN_SOUNDSYSTEM)/lib/debug
|
||||
@../tools/cpifdiff.sh $(DIR)/libsoundsystem.a $(NAN_SOUNDSYSTEM)/lib/
|
||||
@../tools/cpifdiff.sh $(DIR)/debug/libsoundsystem.a $(NAN_SOUNDSYSTEM)/lib/debug/
|
||||
@../tools/cpifdiff.sh $(DIR)/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/
|
||||
@../tools/cpifdiff.sh $(DIR)/debug/libSoundSystem.a $(NAN_SOUNDSYSTEM)/lib/debug/
|
||||
ifeq ($(OS),darwin)
|
||||
ranlib $(NAN_SOUNDSYSTEM)/lib/libsoundsystem.a
|
||||
ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libsoundsystem.a
|
||||
ranlib $(NAN_SOUNDSYSTEM)/lib/libSoundSystem.a
|
||||
ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libSoundSystem.a
|
||||
endif
|
||||
@../tools/cpifdiff.sh *.h $(NAN_SOUNDSYSTEM)/include/
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
LIBNAME = soundsystem
|
||||
LIBNAME = SoundSystem
|
||||
DIR = $(OCGDIR)/intern/SoundSystem
|
||||
|
||||
include nan_compile.mk
|
||||
|
@ -376,9 +376,9 @@ else
|
||||
# NAN_SND_LIBS += $(NAN_FMOD)/lib/libfmod.a
|
||||
NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
||||
else
|
||||
NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
||||
NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
|
||||
NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
||||
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
||||
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
|
||||
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
||||
endif
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user