Fixed Windows conditionals for building resources and OpenGL library linkage in CMake...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3506973d23821a835bc362bd5e94b438a0e468cb..abcb734330e7168c305ed6f518734de440094856 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,10 @@ 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)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 862214da6effcc8690aa49b01d527adce40b3f18..cd827078e8343361b21b236b6fe11e3acec24fd1 100644 (file)
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -137,7 +137,7 @@ if(WIN32)
   set(LUGARU_H
        ${LUGARU_H}
        WinDefs.h
-       res/lugaru.h)
+       res/resource.h)
 endif(WIN32)
 
 if(WIN32)