Merge.

[lugaru.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ea8c4708004ab9c050bf1bcd89c98d638b8905c..9be2c9e9235cfa8a1ef983a1e91f06d1d207bd6c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,11 +23,13 @@ endif(NOT LUGARU_INSTALL_PREFIX)
 set(CMAKE_INSTALL_PREFIX "${LUGARU_INSTALL_PREFIX}" CACHE INTERNAL "Prefix
 prepended to install directories" FORCE)
 
-
+if(WIN32)
+       set(OPENGL_gl_LIBRARY "-lopengl32" CACHE STRING "OpenGL library for Win32" FORCE)
+       set(OPENGL_glu_LIBRARY "-lglu32" CACHE STRING "GLU library for Win32" FORCE)
+endif(WIN32)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 find_package(OpenAL REQUIRED)
-find_package(BZip2 REQUIRED)
 find_package(PNG REQUIRED)
 find_package(JPEG REQUIRED)
 find_package(ZLIB REQUIRED)
@@ -38,7 +40,6 @@ find_package(OggVorbis REQUIRED)
 
 include_directories(
        ${OPENAL_INCLUDES}
-       ${BZIP2_INCLUDE_DIR}
        ${JPEG_INCLUDE_DIR}
        ${PNG_INCLUDE_DIR}
        ${ZLIB_INCLUDE_DIR}
@@ -49,7 +50,7 @@ include_directories(
        ${OGG_INCLUDE_DIR}
        ${CMAKE_SOURCE_DIR}/Source)
 
-set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARY} ${VORBISFILE_LIBS} ${OGG_LIBS})
+set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
 
 add_subdirectory(Source)