Changeset 411 for cafu/trunk

Timestamp:

10/21/11 11:09:30 (7 months ago)

Author:

Carsten

Message:

Completing the changes begun in r410, this change links the alut, ogg, vorbis and mpg123 libraries statically to the OpenAL sound system under Windows as well.
(The changes in r410 mostly addressed the same under Linux, and most but not all of the required changes under Windows.)

Location:

cafu/trunk

Files:

• ExtLibs/freealut/SConscript (modified) (1 diff)
• ExtLibs/freealut/include/AL/alut.h (modified) (1 diff)
• Libs/SoundSystem/Common/MP3Stream.cpp (modified) (1 diff)

cafu/trunk/ExtLibs/freealut/SConscript

@@ -8 +8 @@
 # CPPDEFINES created using VC++ project file as template (removed Windows specific DEFINES for Linux build).
 if sys.platform=="win32":
-    env_freealut.Append(CPPDEFINES=['_WINDOWS', '_USRDLL', 'ALUT_EXPORTS', 'WIN32', '_MBCS', 'ALUT_BUILD_LIBRARY', 'HAVE__STAT', 'HAVE_BASETSD_H', 'HAVE_SLEEP', 'HAVE_WINDOWS_H'])
+    env_freealut.Append(CPPDEFINES=['ALUT_EXPORTS', '_MBCS', 'ALUT_BUILD_LIBRARY', 'HAVE__STAT', 'HAVE_BASETSD_H', 'HAVE_SLEEP', 'HAVE_WINDOWS_H'])
     env_freealut.Append(CPPPATH=['include', '#/ExtLibs/openal-win/include'])
     if env_freealut["TARGET_ARCH"]=="x86":

cafu/trunk/ExtLibs/freealut/include/AL/alut.h

@@ -17 +17 @@
 #endif
 
-#if defined(_WIN32) && !defined(_XBOX)
+#if defined(_WIN32) && !defined(_XBOX) && defined(ALUT_BUILD_AS_DLL)    // CF: I added ALUT_BUILD_AS_DLL so that we can build alut as a *static* library as well.
  #if defined (ALUT_BUILD_LIBRARY)
   #define ALUT_API __declspec(dllexport)

cafu/trunk/Libs/SoundSystem/Common/MP3Stream.cpp

@@ -29 +29 @@
 #include <stdexcept>
 
-#ifdef _WIN32
-// Under Windows, the mpg123 functions must be properly declared for DLL import.
-#define LINK_MPG123_DLL
-#endif
+// #ifdef _WIN32
+// // Under Windows, the mpg123 functions must be properly declared for DLL import.
+// #define LINK_MPG123_DLL
+// #endif
 #include "mpg123.h"