From: Neal Gompa <ngompa13@gmail.com>
Date: Wed, 12 May 2010 23:17:19 +0000 (-0500)
Subject: Fixed Windows conditionals for building resources and OpenGL library linkage in CMake... 
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=b36eef554d77aa30d894d0f3e70b897fba546fc2;p=lugaru.git

Fixed Windows conditionals for building resources and OpenGL library linkage in CMake scripts; Switching to default branch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3506973..abcb734 100644
--- 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 862214d..cd82707 100644
--- 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)