diff options
| author | Kent Mein <mein@cs.umn.edu> | 2004-12-09 16:13:24 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2004-12-09 16:13:24 +0300 |
| commit | 175491deb4d972a6fad5e975f48b2e167ef34a89 (patch) | |
| tree | c1918078ee8e24068481b5d4a490a2f21c94a232 /source/Makefile | |
| parent | bdffe196afee7ea2cd5bbdffa3514b4ae2b68196 (diff) | |
I had to change a bit of the stuff I added to get solaris openal working.
I also removed a redundant bit of config stuff for freebsd
that didn't do anything.
Kent
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/source/Makefile b/source/Makefile index 8b614e17e34..6af0ec6aac0 100644 --- a/source/Makefile +++ b/source/Makefile @@ -191,6 +191,9 @@ ifeq ($(INTERNATIONAL), true) ifeq ($(OS), darwin) COMLIB += $(NAN_GETTEXT)/lib/libintl.a endif + ifeq ($(OS), solaris) + COMLIB += $(NAN_GETTEXT)/lib/libintl.a + endif endif ifeq ($(OS), irix) @@ -370,21 +373,12 @@ ifeq ($(NAN_NO_OPENAL), true) else ifeq ($(OS),$(findstring $(OS), "freebsd linux windows")) ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc x86_64")) - ifeq ($(OS),freebsd) - NAN_SND_LIBS = $(SOUNDSYSTEM) - NAN_SND_LIBS += $(DUMMYSOUND) - NAN_SND_LIBS += $(OPENALSOUND) - NAN_SND_LIBS += $(SDLSOUND) - NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a - NAN_SND_LIBS += $(SOUNDSYSTEM) - else NAN_SND_LIBS = $(SOUNDSYSTEM) NAN_SND_LIBS += $(DUMMYSOUND) NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a NAN_SND_LIBS += $(SOUNDSYSTEM) - endif else ifeq ($(OS),windows) NAN_SND_LIBS = $(SOUNDSYSTEM) @@ -400,16 +394,25 @@ else endif endif else - ifeq ($(OS),$(findstring $(OS), "darwin solaris")) + ifeq ($(OS),darwin) NAN_SND_LIBS = $(SOUNDSYSTEM) NAN_SND_LIBS += $(DUMMYSOUND) NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a NAN_SND_LIBS += $(SOUNDSYSTEM) else - NAN_SND_LIBS = $(SOUNDSYSTEM) - NAN_SND_LIBS += $(DUMMYSOUND) - NAN_SND_LIBS += $(SOUNDSYSTEM) + ifeq ($OS),solaris) + NAN_SND_LIBS = $(SOUNDSYSTEM) + NAN_SND_LIBS += $(DUMMYSOUND) + NAN_SND_LIBS += $(OPENALSOUND) + NAN_SND_LIBS += $(SDLSOUND) + NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a + NAN_SND_LIBS += $(SOUNDSYSTEM) + else + NAN_SND_LIBS = $(SOUNDSYSTEM) + NAN_SND_LIBS += $(DUMMYSOUND) + NAN_SND_LIBS += $(SOUNDSYSTEM) + endif endif endif endif |