X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=0fdc595d345b2fcec23d26121c5d33ae7e9b8424;hb=8ce1f80392136d7a794bab5d60d9053dd53684a4;hp=9fa75b4685ff33da92a58fb3742a2f498d1da19a;hpb=b3a03b79ce621fec579f930c63ba2fdf526d66db;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fa75b4..0fdc595 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,15 +33,15 @@ SET(FREEGLUT_SRCS
 # Android port requires adding a version of these compatible with
 # OpenGL ES (TODO):
 IF(NOT ANDROID)
-       LIST(APPEND FREEGLUT_SRCS
-               src/fg_font.c
-               src/fg_geometry.c
-               src/fg_menu.c
-               src/fg_teapot.c
-)
+    LIST(APPEND FREEGLUT_SRCS
+        src/fg_font.c
+        src/fg_geometry.c
+        src/fg_menu.c
+        src/fg_teapot.c
+    )
 ENDIF()
 
-IF(WIN32)   # TODO: is this true for 64 bit as well? Chaneg to WINDOWS?
+IF(WIN32)
 	LIST(APPEND FREEGLUT_SRCS
 		src/mswin/fg_cursor_mswin.c
 		src/mswin/fg_display_mswin.c
@@ -57,7 +57,15 @@ IF(WIN32)   # TODO: is this true for 64 bit as well? Chaneg to WINDOWS?
 		src/mswin/fg_state_mswin.c
 		src/mswin/fg_structure_mswin.c
 		src/mswin/fg_window_mswin.c
-)
+        freeglut.rc
+    )
+    IF (NOT CMAKE_CL_64)
+        # .def file only for 32bit Windows builds
+        LIST(APPEND FREEGLUT_SRCS
+            src/freeglutdll.def
+        )
+    ENDIF()
+
 ELSEIF(ANDROID)
     LIST(APPEND FREEGLUT_SRCS
         src/egl/fg_internal_egl.h
@@ -77,7 +85,7 @@ ELSEIF(ANDROID)
         src/android/fg_window_android.c
         src/android/opengles_stubs.c
         src/android/fg_internal_android.h
-)
+    )
 ELSE()
 	LIST(APPEND FREEGLUT_SRCS
 		src/x11/fg_cursor_x11.c
@@ -96,9 +104,7 @@ ELSE()
 		src/x11/fg_structure_x11.c
 		src/x11/fg_window_x11.c
 		src/x11/fg_xinput_x11.c
-)
-
-
+    )
 ENDIF()
 
 # Neatly organize all of the output files in the build directory
@@ -209,11 +215,16 @@ ENDIF()
 IF(WIN32)
 	LIST(APPEND LIBS winmm)
 	IF(BUILD_SHARED_LIBS)
-		LIST(APPEND FREEGLUT_SRCS src/Common/freeglutdll.def freeglut.rc)
-		# XXX I assume that if we want both shared and static this one is appropriate
-		ADD_DEFINITIONS(-DFREEGLUT_EXPORTS)
-	ELSE()
-		ADD_DEFINITIONS(-DFREEGLUT_STATIC)
+		SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS)
+	ENDIF()
+    IF(BUILD_STATIC_LIBS)
+    	SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)
+        # need to set machine:x64 for linker, at least for VC10, and
+        # doesn't hurt for older compilers:
+        # http://public.kitware.com/Bug/view.php?id=11240#c22768
+        IF (CMAKE_CL_64)
+            SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+        ENDIF()
 	ENDIF()
 ELSE()
 	# on UNIX we need to make sure:
@@ -276,6 +287,7 @@ MACRO(ADD_DEMO name)
         IF(BUILD_STATIC_LIBS)
             ADD_EXECUTABLE(${name}_static ${ARGN})
             TARGET_LINK_LIBRARIES(${name}_static ${DEMO_LIBS} freeglut_static)
+            SET_TARGET_PROPERTIES(${name}_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)
         ENDIF()
     ENDIF()
 ENDMACRO()