diff options
author | Stefan Gartner <stefang@aon.at> | 2004-04-14 17:00:36 +0400 |
---|---|---|
committer | Stefan Gartner <stefang@aon.at> | 2004-04-14 17:00:36 +0400 |
commit | 837da93f19376bd61a478b6cda11868415241703 (patch) | |
tree | db72b3c76efa1862edf8f9f549a5bc9f9e66fa69 /source | |
parent | 7dc152b01a6b77a840e916ecbf5fa34c3a6ab2a8 (diff) |
enable openal support for os x and linux-powerpc
as there is a conflict between openal and sdl (when compiled with cdrom
support), i had to disable support for cd playing using sdl on os x
for the time being.
Diffstat (limited to 'source')
-rw-r--r-- | source/Makefile | 4 | ||||
-rw-r--r-- | source/nan_link.mk | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/Makefile b/source/Makefile index 3fb82d4033e..20322946ab7 100644 --- a/source/Makefile +++ b/source/Makefile @@ -376,7 +376,7 @@ ifeq ($(NAN_NO_OPENAL), true) NAN_SND_LIBS += $(SOUNDSYSTEM) else ifeq ($(OS),$(findstring $(OS), "freebsd linux windows")) - ifeq ($(CPU),i386) + ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc")) ifeq ($(OS),freebsd) NAN_SND_LIBS = $(SOUNDSYSTEM) NAN_SND_LIBS += $(DUMMYSOUND) @@ -410,6 +410,8 @@ else 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) diff --git a/source/nan_link.mk b/source/nan_link.mk index fd117f6e4f7..7f741ffad20 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -58,7 +58,8 @@ endif ifeq ($(OS),darwin) LLIBS += -lGLU -lGL LLIBS += -lz -framework Carbon -framework AGL - LLIBS += -framework QuickTime + LLIBS += -framework QuickTime -framework CoreAudio + LLIBS += -framework AudioUnit -framework AudioToolbox LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries DBG_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries endif |