Merge to unconfuse my repo.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b988ac11c2e9ecce666c1b7a853e65bd62028351..abcb734330e7168c305ed6f518734de440094856 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,8 @@ 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)
+       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/")

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)

diff --git a/Source/gamegl.h b/Source/gamegl.h
index 38f0d4c935d47dc4ef2adec3564ccb3e493cc498..482a21d31de33adbe136fc75690fd6772adf2928 100644 (file)
--- a/Source/gamegl.h
+++ b/Source/gamegl.h
@@ -49,10 +49,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   #define GL_GLEXT_PROTOTYPES
   #include <gl/gl.h>
   #include <gl/glu.h>
-  #include <gl/glaux.h>
+  //#include <gl/glaux.h> -- EVIL and OLD, NEVER USE IT!
   #include <gl/glext.h>
   #include "MacCompatibility.h"
-  #include "il/ilut.h"
+  //#include "il/ilut.h"
 
   #define glDeleteTextures( a, b) glDeleteTextures( (a), (const unsigned int *)(b) );
 #endif