[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20217] trunk/blender: * Fix for compile error on MSVC.

[Brecht Van Lommel]

Revision: 20217
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20217
Author:   blendix
Date:     2009-05-15 20:21:27 +0200 (Fri, 15 May 2009)

Log Message:
-----------
* Fix for compile error on MSVC.
* Remove alut from makefiles and cmake.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
    trunk/blender/source/Makefile

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2009-05-15 16:24:08 UTC (rev 20216)
+++ trunk/blender/CMakeLists.txt	2009-05-15 18:21:27 UTC (rev 20217)
@@ -99,20 +99,6 @@
     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

Modified: trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
===================================================================
--- trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2009-05-15 16:24:08 UTC (rev 20216)
+++ trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2009-05-15 18:21:27 UTC (rev 20217)
@@ -514,7 +514,7 @@
 					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);
 				}

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2009-05-15 16:24:08 UTC (rev 20216)
+++ trunk/blender/source/Makefile	2009-05-15 18:21:27 UTC (rev 20217)
@@ -363,8 +363,6 @@
         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 @@
         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 @@
       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 @@
         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)