From bcb5d4e54bc4169c31209a62cd3ddb45a6538101 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 13 May 2010 20:00:42 -0500 Subject: [PATCH] Modified internal SDL lib configuration to properly set up; Added #undef/#define to 'openal_wrapper.h' to fix building on Windows --- CMakeLists.txt | 12 ++++++++---- Source/openal_wrapper.h | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a0a66a..fe0c1d6 100644 --- 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 e1ca95d..41560d1 100644 --- 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); -- 2.39.5