diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-07-17 06:36:56 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-07-17 06:36:56 +0400 |
| commit | ae512b137ca979b2e9baf1d714d9f2d58680a16a (patch) | |
| tree | 03e865e6f77df4c8c1292203777d664f7c92bc28 | |
| parent | 68b3cfbbe541b048ce00c0813ca603c7f90baa0c (diff) | |
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/*
| -rw-r--r-- | intern/SoundSystem/Makefile | 10 | ||||
| -rw-r--r-- | intern/SoundSystem/intern/Makefile | 2 | ||||
| -rw-r--r-- | source/Makefile | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index 4273b3380f9..e8e95174c95 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -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/ diff --git a/intern/SoundSystem/intern/Makefile b/intern/SoundSystem/intern/Makefile index 252c6c022fe..65b89f205ee 100644 --- a/intern/SoundSystem/intern/Makefile +++ b/intern/SoundSystem/intern/Makefile @@ -31,7 +31,7 @@ # # -LIBNAME = soundsystem +LIBNAME = SoundSystem DIR = $(OCGDIR)/intern/SoundSystem include nan_compile.mk diff --git a/source/Makefile b/source/Makefile index 15742b5c1d1..11170300f52 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 |