X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=e17cd6066e68d68650a563b9a5f614d1af503257;hb=ac7b481fed95ce2f9823bf23f8733018665c51be;hp=b151e4f59c711b5e62920fa91928b895bc6b8f2c;hpb=8122d20eece8b654d6534a04d3fd658e581fb596;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b151e4f..e17cd60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,8 @@ SET(FREEGLUT_SRCS
 
 IF(WIN32)
 	LIST(APPEND FREEGLUT_SRCS
+		src/Common/xparsegeometry_repl.c
+		src/Common/xparsegeometry_repl.h
 		src/mswin/freeglut_cursor_mswin.c
 		src/mswin/freeglut_display_mswin.c
 		src/mswin/freeglut_ext_mswin.c
@@ -85,7 +87,7 @@ OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON)
 OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON)
 
 FIND_PACKAGE(OpenGL REQUIRED)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${OPENGL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
 LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
 LIST(APPEND LIBS m)
 
@@ -130,7 +132,7 @@ CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT)
 # ensure that all CMake-generated files are kept away from the main source tree.
 # As a result, the build directory must to be added to the include path list.
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src)
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 # by default, at least on UNIX, we want to build both
@@ -143,6 +145,7 @@ 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
@@ -159,8 +162,9 @@ ELSE()
 	#   on Xrandr or Xxf86vm)
 	SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME glut)
 	SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME glut)
-	TARGET_LINK_LIBRARIES(freeglut ${LIBS})
 ENDIF()
+TARGET_LINK_LIBRARIES(freeglut ${LIBS})
+TARGET_LINK_LIBRARIES(freeglut_static ${LIBS})
 
 IF(BUILD_SHARED_LIBS)
 	INSTALL(TARGETS freeglut DESTINATION lib)