Fixing "cmake" with the new location of the "freeglut_xinput_x11.c" file

[freeglut] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e15d91..9583569 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ SET(FREEGLUT_SRCS
        src/Common/freeglut_geometry.c\r
        src/Common/freeglut_glutfont_definitions.c\r
        src/Common/freeglut_init.c\r
+       src/Common/freeglut_internal.h\r
        src/Common/freeglut_input_devices.c\r
        src/Common/freeglut_joystick.c\r
        src/Common/freeglut_main.c\r
@@ -33,21 +34,54 @@ SET(FREEGLUT_SRCS
        src/Common/freeglut_teapot.c\r
        src/Common/freeglut_videoresize.c\r
        src/Common/freeglut_window.c\r
-       src/Common/freeglut_xinput.c\r
 )\r
 \r
-#IF(WIN32)\r
-#      LIST(APPEND FREEGLUT_SRCS src/Windows/freeglut_cursor_windows.c)\r
-#ELSE()\r
-#      LIST(APPEND FREEGLUT_SRCS src/X11/freeglut_cursor_x11.c)\r
-#ENDIF()\r
+IF(WIN32)\r
+       LIST(APPEND FREEGLUT_SRCS\r
+               src/mswin/freeglut_cursor_mswin.c\r
+               src/mswin/freeglut_display_mswin.c\r
+               src/mswin/freeglut_ext_mswin.c\r
+               src/mswin/freeglut_gamemode_mswin.c\r
+               src/mswin/freeglut_init_mswin.c\r
+               src/mswin/freeglut_internal_mswin.h\r
+               src/mswin/freeglut_input_devices_mswin.c\r
+               src/mswin/freeglut_joystick_mswin.c\r
+               src/mswin/freeglut_main_mswin.c\r
+               src/mswin/freeglut_menu_mswin.c\r
+               src/mswin/freeglut_spaceball_mswin.c\r
+               src/mswin/freeglut_state_mswin.c\r
+               src/mswin/freeglut_structure_mswin.c\r
+               src/mswin/freeglut_window_mswin.c\r
+)\r
+ELSE()\r
+       LIST(APPEND FREEGLUT_SRCS\r
+               src/x11/freeglut_cursor_x11.c\r
+               src/x11/freeglut_display_x11.c\r
+               src/x11/freeglut_ext_x11.c\r
+               src/x11/freeglut_gamemode_x11.c\r
+               src/x11/freeglut_glutfont_definitions_x11.c\r
+               src/x11/freeglut_init_x11.c\r
+               src/x11/freeglut_internal_x11.h\r
+               src/x11/freeglut_input_devices_x11.c\r
+               src/x11/freeglut_joystick_x11.c\r
+               src/x11/freeglut_main_x11.c\r
+               src/x11/freeglut_menu_x11.c\r
+               src/x11/freeglut_spaceball_x11.c\r
+               src/x11/freeglut_state_x11.c\r
+               src/x11/freeglut_structure_x11.c\r
+               src/x11/freeglut_window_x11.c\r
+               src/x11/freeglut_xinput_x11.c\r
+)\r
+\r
+\r
+ENDIF()\r
 \r
 # Neatly organize all of the output files in the build directory\r
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)\r
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)\r
 \r
 # BUILD_SHARED_LIBS is already a standard CMake variable, but we need to\r
-# re-delcare it here so it will show up in the GUI.\r
+# re-declare it here so it will show up in the GUI.\r
 OPTION(BUILD_SHARED_LIBS "Build FreeGLUT as a shared library." ON)\r
 \r
 FIND_PACKAGE(OpenGL REQUIRED)\r