X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=4833e360834086d5420fcb6719c0593b46cd58d6;hb=f66b1c7e45b9ed0b7def76825fb4fa042697b693;hp=81af4a836730b166eb7eaa070b8aee711b665df4;hpb=4c2cf07e4b6214be9d355859a0d5864e34b37e77;p=lugaru.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81af4a8..4833e36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,10 @@ endif(NOT LUGARU_INSTALL_PREFIX)
 
 set(CMAKE_INSTALL_PREFIX "${LUGARU_INSTALL_PREFIX}" CACHE INTERNAL "Prefix prepended to install directories" FORCE)
 
-if(WIN32)
+if(MINGW)
 	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)
+endif(MINGW)
 
 
 
@@ -70,13 +70,27 @@ if(UNIX)
 	)
 endif(UNIX)
 
+if(MSVC) # MSVC non-C99 support biting us hard
+	set(LUGARU_H
+		${LUGARU_H}
+		${DEPDIR}/msinttypes/stdint.h
+		${DEPDIR}/msinttypes/inttypes.h
+	)
+endif(MSVC)
+
+if(UNIX)
+	set(LUGARU_H
+		${LUGARU_H}
+		${SRCDIR}/MacCompatibility.h
+	)
+endif(UNIX)
+
 set(LUGARU_H
 	${SRCDIR}/Constants.h
 	${SRCDIR}/Frustum.h
 	${SRCDIR}/Game.h
 	${SRCDIR}/Lights.h
 	${SRCDIR}/LinkedList.h
-	${SRCDIR}/MacCompatibility.h
 	${SRCDIR}/Models.h
 	${SRCDIR}/Objects.h
 	${SRCDIR}/Person.h