X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=8b3c49be4e6f6a06f1d740a9bfe9cef30bd06fe3;hb=026a20d0a52fc7922f694171616f0291c9b0514c;hp=d3f083a45cdb613ed4166e3e23a868c60050f7b8;hpb=cb1e59cf5e6ac8034ae91abfd320874004a44c88;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index d3f083a..8b3c49b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,7 @@ SET(FREEGLUT_SRCS src/fg_gl2.c src/fg_gl2.h src/fg_init.c + src/fg_init.h src/fg_internal.h src/fg_input_devices.c src/fg_joystick.c @@ -139,11 +140,12 @@ ELSE() src/x11/fg_window_x11.c src/x11/fg_xinput_x11.c ) - IF(!(FREEGLUT_GLES2 OR FREEGLUT_GLES1)) + IF(NOT(FREEGLUT_GLES2 OR FREEGLUT_GLES1)) LIST(APPEND FREEGLUT_SRCS src/x11/fg_internal_x11_glx.h src/x11/fg_display_x11_glx.c src/x11/fg_state_x11_glx.c + src/x11/fg_state_x11_glx.h src/x11/fg_window_x11_glx.c src/x11/fg_window_x11_glx.h ) @@ -194,7 +196,7 @@ IF(WIN32) ENDIF() IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") IF(!ANDROID) # not setting -ansi as EGL/KHR headers doesn't support it SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi")