From b36eef554d77aa30d894d0f3e70b897fba546fc2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 12 May 2010 18:17:19 -0500 Subject: [PATCH] Fixed Windows conditionals for building resources and OpenGL library linkage in CMake scripts; Switching to default branch --- CMakeLists.txt | 5 ++++- Source/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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) -- 2.39.2