diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-15 22:21:27 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-15 22:21:27 +0400 |
| commit | 58db6df0696ab066b1cf4b37f4593fa03f65e099 (patch) | |
| tree | 206a8df4ba29fcf867a6068eab430668773f3508 | |
| parent | 009dea9577620d2ff0d0c95f0b4104237dea1abe (diff) | |
* Fix for compile error on MSVC.
* Remove alut from makefiles and cmake.
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | intern/SoundSystem/openal/SND_OpenALDevice.cpp | 2 | ||||
| -rw-r--r-- | source/Makefile | 8 |
3 files changed, 1 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1340ec0f3b9..9ebbf1fbb54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,20 +99,6 @@ IF(UNIX) ENDIF(OPENAL_FOUND) ENDIF(WITH_OPENAL) - FIND_LIBRARY(ALUT_LIBRARY - NAMES alut - PATHS - /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - ) - IF(ALUT_LIBRARY) - SET(OPENAL_LIB ${OPENAL_LIB} ${ALUT_LIBRARY}) - ENDIF(ALUT_LIBRARY) - FIND_LIBRARY(INTL_LIBRARY NAMES intl PATHS diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index df02d11ae39..6b0e863e73d 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -514,7 +514,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, bitrate = SND_GetBitRate(memlocation); /* load the sample into openal */ - SND_alutLoadWAVMemory((char*)memlocation, size, &sampleformat, &data, &numberofsamples, &samplerate, &loop); + SND_alutLoadWAVMemory((ALbyte*)memlocation, size, &sampleformat, &data, &numberofsamples, &samplerate, &loop); /* put it in the buffer */ alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate); } diff --git a/source/Makefile b/source/Makefile index 7374ef3e7d6..d06105a0b9b 100644 --- a/source/Makefile +++ b/source/Makefile @@ -363,8 +363,6 @@ else NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a - ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a) - NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else ifeq ($(OS),windows) @@ -373,8 +371,6 @@ else NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib - ALUT = $(wildcard $(NAN_OPENAL)/lib/alut_static.lib) - NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else NAN_SND_LIBS = $(SOUNDSYSTEM) @@ -388,8 +384,6 @@ else NAN_SND_LIBS += $(DUMMYSOUND) NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a - ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a) - NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else ifeq ($(OS), solaris) @@ -398,8 +392,6 @@ else NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(SDLSOUND) NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a - ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a) - NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else ifeq ($(OS), irix) |