* Fix for compile error on MSVC.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 15 May 2009 18:21:27 +0000 (18:21 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 15 May 2009 18:21:27 +0000 (18:21 +0000)
* Remove alut from makefiles and cmake.

CMakeLists.txt
intern/SoundSystem/openal/SND_OpenALDevice.cpp
source/Makefile

index 1340ec0f3b90d6636a50dbc3a1de137f6dcd0e74..9ebbf1fbb54309d7a65fba5b296535bee3b550ae 100644 (file)
@@ -99,20 +99,6 @@ IF(UNIX)
     ENDIF(OPENAL_FOUND)
   ENDIF(WITH_OPENAL)
 
     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
   FIND_LIBRARY(INTL_LIBRARY
     NAMES intl
     PATHS
index df02d11ae391b8386b00d14026d9747a37f5b2e9..6b0e863e73dd862bb8515bc7246be0d4a46a1ba8 100644 (file)
@@ -514,7 +514,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name,
                                        bitrate = SND_GetBitRate(memlocation);
                                        
                                        /* load the sample into openal */
                                        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);
                                }
                                        /* put it in the buffer */
                                        alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate);
                                }
index 7374ef3e7d67614cdad78d07ce8ccc041b1e7576..d06105a0b9b190b66a70cdcdf49612ef943c55fd 100644 (file)
@@ -363,8 +363,6 @@ else
         NAN_SND_LIBS += $(OPENALSOUND)
         NAN_SND_LIBS += $(SDLSOUND)
         NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
         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)
         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
         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)
         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
       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)
       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
         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)
         NAN_SND_LIBS += $(SOUNDSYSTEM)
       else
         ifeq ($(OS), irix)