From: Neal Gompa Date: Fri, 14 May 2010 05:59:50 +0000 (-0500) Subject: Added in support for MSVC building for MSVC2005 and MSVC2008; Windows support is... X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=6fc45cb7ea4054a25eb0e8d2158c7079f5c4216a;p=lugaru.git Added in support for MSVC building for MSVC2005 and MSVC2008; Windows support is hopefully complete from the builsystem. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3908731..7cb9cef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,11 +163,16 @@ if (NOT OPENAL_FOUND) if (WIN32) set(LUGARU_HAS_INTERNAL_OPENAL True) -# if (MSVC) # !!! FIXME: package MSVC .dll and .lib for Windows? -# set(OPENAL_LIBRARY -# ${OPENALDIR}/lib/win32/msvc/OpenAL32.lib -# ) -# endif (MSVC) + if (MSVC80) + set(OPENAL_LIBRARY + ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.lib + ) + endif (MSVC80) + if (MSVC90) + set(OPENAL_LIBRARY + ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.lib + ) + endif (MSVC90) if (MINGW) set(OPENAL_LIBRARY ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a @@ -203,12 +208,18 @@ if (NOT SDL_FOUND) if (WIN32) set(LUGARU_HAS_INTERNAL_SDL True) - if (MSVC) + if (MSVC80) + set(SDL_LIBRARY + ${SDLDIR}/lib/win32/msvc2005/SDLmain.lib + ${SDLDIR}/lib/win32/msvc2005/SDL.lib + ) + endif (MSVC80) + if (MSVC90) set(SDL_LIBRARY - ${SDLDIR}/lib/win32/msvc/SDLmain.lib - ${SDLDIR}/lib/win32/msvc/SDL.lib + ${SDLDIR}/lib/win32/msvc2008/SDLmain.lib + ${SDLDIR}/lib/win32/msvc2008/SDL.lib ) - endif (MSVC) + endif (MSVC90) if (MINGW) set(SDL_LIBRARY "mingw32" @@ -453,10 +464,14 @@ endif(WIN32) # Install target if(WIN32) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX}) - if(MSVC) - install(FILES ${SDLDIR}/lib/win32/msvc/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) - #install(FILES ${OPENALDIR}/lib/win32/msvc/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) # FIXME: Add MSVC OpenAL library! - endif(MSVC) + if(MSVC80) + install(FILES ${SDLDIR}/lib/win32/msvc2005/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(FILES ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif(MSVC80) + if(MSVC90) + install(FILES ${SDLDIR}/lib/win32/msvc2008/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + install(FILES ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif(MSVC90) if(MINGW) install(FILES ${SDLDIR}/lib/win32/mingw/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) install(FILES ${OPENALDIR}/lib/win32/mingw/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.dll b/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.dll new file mode 100644 index 0000000..b63bb2f Binary files /dev/null and b/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.dll differ diff --git a/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.lib b/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.lib new file mode 100644 index 0000000..d635de9 Binary files /dev/null and b/Dependencies/OpenAL/lib/win32/msvc2005/OpenAL32.lib differ diff --git a/Dependencies/OpenAL/lib/win32/msvc2008/OpenAL32.dll b/Dependencies/OpenAL/lib/win32/msvc2008/OpenAL32.dll new file mode 100644 index 0000000..b63bb2f Binary files /dev/null and b/Dependencies/OpenAL/lib/win32/msvc2008/OpenAL32.dll differ diff --git a/Dependencies/OpenAL/lib/win32/msvc2008/OpenAL32.lib b/Dependencies/OpenAL/lib/win32/msvc2008/OpenAL32.lib new file mode 100644 index 0000000..d635de9 Binary files /dev/null and b/Dependencies/OpenAL/lib/win32/msvc2008/OpenAL32.lib differ diff --git a/Dependencies/SDL12/lib/win32/msvc/SDL.dll b/Dependencies/SDL12/lib/win32/msvc/SDL.dll deleted file mode 100755 index 628cdfc..0000000 Binary files a/Dependencies/SDL12/lib/win32/msvc/SDL.dll and /dev/null differ diff --git a/Dependencies/SDL12/lib/win32/msvc/SDL.lib b/Dependencies/SDL12/lib/win32/msvc/SDL.lib deleted file mode 100755 index 5b3f17c..0000000 Binary files a/Dependencies/SDL12/lib/win32/msvc/SDL.lib and /dev/null differ diff --git a/Dependencies/SDL12/lib/win32/msvc/SDLmain.lib b/Dependencies/SDL12/lib/win32/msvc/SDLmain.lib deleted file mode 100755 index 945b9ad..0000000 Binary files a/Dependencies/SDL12/lib/win32/msvc/SDLmain.lib and /dev/null differ diff --git a/Dependencies/SDL12/lib/win32/msvc2005/SDL.dll b/Dependencies/SDL12/lib/win32/msvc2005/SDL.dll new file mode 100644 index 0000000..628cdfc Binary files /dev/null and b/Dependencies/SDL12/lib/win32/msvc2005/SDL.dll differ diff --git a/Dependencies/SDL12/lib/win32/msvc2005/SDL.lib b/Dependencies/SDL12/lib/win32/msvc2005/SDL.lib new file mode 100644 index 0000000..993fd2b Binary files /dev/null and b/Dependencies/SDL12/lib/win32/msvc2005/SDL.lib differ diff --git a/Dependencies/SDL12/lib/win32/msvc2005/SDLmain.lib b/Dependencies/SDL12/lib/win32/msvc2005/SDLmain.lib new file mode 100644 index 0000000..13bf9f9 Binary files /dev/null and b/Dependencies/SDL12/lib/win32/msvc2005/SDLmain.lib differ diff --git a/Dependencies/SDL12/lib/win32/msvc2008/SDL.dll b/Dependencies/SDL12/lib/win32/msvc2008/SDL.dll new file mode 100644 index 0000000..628cdfc Binary files /dev/null and b/Dependencies/SDL12/lib/win32/msvc2008/SDL.dll differ diff --git a/Dependencies/SDL12/lib/win32/msvc2008/SDL.lib b/Dependencies/SDL12/lib/win32/msvc2008/SDL.lib new file mode 100644 index 0000000..993fd2b Binary files /dev/null and b/Dependencies/SDL12/lib/win32/msvc2008/SDL.lib differ diff --git a/Dependencies/SDL12/lib/win32/msvc2008/SDLmain.lib b/Dependencies/SDL12/lib/win32/msvc2008/SDLmain.lib new file mode 100644 index 0000000..13bf9f9 Binary files /dev/null and b/Dependencies/SDL12/lib/win32/msvc2008/SDLmain.lib differ