Modified internal SDL lib configuration to properly set up; Added #undef/#define...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a0a66a2df1e2308dc56f79382e8b653cdc75bda..fe0c1d68708892192cffcf20d5941468c27d7127 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,16 +205,20 @@ if (NOT SDL_FOUND)
     if (WIN32)
         set(LUGARU_HAS_INTERNAL_SDL True)
         if (MSVC)
-          set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/msvc/SDL.lib
+          set(SDLMAIN_LIBRARY
               ${SDLDIR}/lib/win32/msvc/SDLmain.lib
           )
+          set(SDL_LIBRARY_TEMP
+              ${SDLDIR}/lib/win32/msvc/SDL.lib
+          )
         endif (MSVC)
         if (MINGW)
-          set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+          set(SDLMAIN_LIBRARY
               ${SDLDIR}/lib/win32/mingw/libSDLmain.a
           )
+          set(SDL_LIBRARY_TEMP
+              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+          )
         endif (MINGW)
     endif (WIN32)
 

diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h
index e1ca95d5da5e1639db57c9ba4276fdee06ce1351..41560d1c45380e750708e013b9ea26ec1c35091d 100644 (file)
--- a/Source/openal_wrapper.h
+++ b/Source/openal_wrapper.h
@@ -65,6 +65,9 @@ enum OPENAL_OUTPUTTYPES
 extern "C" {
 #endif
 
+#undef AL_API
+#define AL_API
+
 AL_API void OPENAL_3D_Listener_SetAttributes(const float *pos, const float *vel, float fx, float fy, float fz, float tx, float ty, float tz);
 AL_API signed char OPENAL_3D_SetAttributes(int channel, const float *pos, const float *vel);
 AL_API void OPENAL_3D_SetDopplerFactor(float scale);