X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=83e5d31dad4f6efb9b3e2299d4ac35feb2a98e86;hb=1feb202b2d028db371116442bae561580d245f52;hp=05ee255423a34f082f0882bed65a1b8bb2350bd2;hpb=be0851a736f7a14a550e113c17634c93df90677b;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index 05ee255..83e5d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,11 +43,15 @@ SET(FREEGLUT_SRCS src/fg_ext.c src/fg_font_data.c src/fg_gamemode.c + 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 src/fg_main.c + src/fg_main.h src/fg_misc.c src/fg_overlay.c src/fg_spaceball.c @@ -62,9 +66,15 @@ SET(FREEGLUT_SRCS IF(NOT FREEGLUT_GLES2 AND NOT FREEGLUT_GLES1) LIST(APPEND FREEGLUT_SRCS src/fg_font.c - src/fg_geometry.c src/fg_menu.c src/fg_teapot.c + src/fg_teapot_data.h + src/fg_geometry.c + ) +ELSE() + LIST(APPEND FREEGLUT_SRCS + src/fg_geometry.c + src/gles_stubs.c ) ENDIF() @@ -95,30 +105,26 @@ IF(WIN32) ELSEIF(ANDROID) LIST(APPEND FREEGLUT_SRCS - src/egl/fg_internal_egl.h - src/egl/fg_display_egl.c - src/egl/fg_init_egl.c - src/egl/fg_structure_egl.c - src/egl/fg_window_egl.c - src/egl/fg_window_egl.h src/android/native_app_glue/android_native_app_glue.c src/android/native_app_glue/android_native_app_glue.h - src/android/fg_runtime_android.c + src/android/fg_internal_android.h + src/android/fg_cursor_android.c + src/android/fg_ext_android.c src/android/fg_gamemode_android.c src/android/fg_init_android.c src/android/fg_input_devices_android.c src/android/fg_joystick_android.c src/android/fg_main_android.c + src/android/fg_main_android.h + src/android/fg_runtime_android.c src/android/fg_spaceball_android.c src/android/fg_state_android.c + src/android/fg_structure_android.c 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 - src/x11/fg_display_x11.c src/x11/fg_ext_x11.c src/x11/fg_gamemode_x11.c src/x11/fg_glutfont_definitions_x11.c @@ -134,6 +140,31 @@ ELSE() src/x11/fg_window_x11.c src/x11/fg_xinput_x11.c ) + 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 + ) + ENDIF() +ENDIF() +IF(FREEGLUT_GLES2 OR FREEGLUT_GLES1) + LIST(APPEND FREEGLUT_SRCS + src/egl/fg_internal_egl.h + src/egl/fg_display_egl.c + src/egl/fg_ext_egl.c + src/egl/fg_init_egl.c + src/egl/fg_init_egl.h + src/egl/fg_state_egl.c + src/egl/fg_state_egl.h + src/egl/fg_structure_egl.c + src/egl/fg_structure_egl.h + src/egl/fg_window_egl.c + src/egl/fg_window_egl.h + ) ENDIF() # For OpenGL ES (GLES): @@ -147,7 +178,7 @@ IF(FREEGLUT_GLES2) LIST(APPEND LIBS GLESv2 EGL) ELSEIF(FREEGLUT_GLES1) ADD_DEFINITIONS(-DFREEGLUT_GLES1) - LIST(APPEND LIBS GLESv1 EGL) + LIST(APPEND LIBS GLESv1_CM EGL) ELSE() FIND_PACKAGE(OpenGL REQUIRED) LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) @@ -164,7 +195,15 @@ IF(WIN32) ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() -if(UNIX AND NOT ANDROID) +IF(CMAKE_COMPILER_IS_GNUCC) + 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") + ENDIF() +ENDIF(CMAKE_COMPILER_IS_GNUCC) + +IF(UNIX AND NOT ANDROID) FIND_PACKAGE(X11 REQUIRED) LIST(APPEND LIBS ${X11_LIBRARIES}) IF(X11_Xrandr_FOUND) @@ -180,6 +219,11 @@ if(UNIX AND NOT ANDROID) LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ENDIF() ENDIF() +IF(ANDROID) + # -landroid for ANativeWindow + # -llog for native Android logging + LIST(APPEND LIBS android log) +ENDIF() INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) @@ -217,6 +261,27 @@ IF (NOT (HAVE_STDINT_H OR HAVE_INTTYPES_H)) ENDIF() ENDIF() +# Check for sinf/cosf/sqrtf +# CHECK_FUNCTION_EXISTS doesn't work because check requires +#CHECK_FUNCTION_EXISTS(sinf HAVE_SINF) +#CHECK_FUNCTION_EXISTS(cosf HAVE_COSF) +#CHECK_FUNCTION_EXISTS(sqrtf HAVE_SQRTF) +INCLUDE(CheckCSourceCompiles) +CHECK_C_SOURCE_COMPILES(" + #include + int main(){sinf(0); return 0;} + " HAVE_SINF +) +CHECK_C_SOURCE_COMPILES(" + #include + int main(){cosf(0); return 0;} + " HAVE_COSF +) +CHECK_C_SOURCE_COMPILES(" + #include + int main(){sqrtf(0); return 0;} + " HAVE_SQRTF +) # The generated config.h is placed in the project's build directory, just to # ensure that all CMake-generated files are kept away from the main source tree. @@ -266,8 +331,16 @@ ELSE() # - the shared library should link to the dependency libraries so that the user # won't have to link them explicitly (they shouldn't have to know that we depend # 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) + IF(FREEGLUT_GLES2) + SET(LIBNAME freeglut-gles2) + ELSEIF(FREEGLUT_GLES1) + SET(LIBNAME freeglut-gles1) + ELSE() + SET(LIBNAME glut) + ENDIF() + + SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME ${LIBNAME}) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) IF(ANDROID) # Not in CMake toolchain file, because the toolchain # file is called several times and generally doesn't @@ -334,42 +407,39 @@ ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c ADD_DEMO(subwin progs/demos/subwin/subwin.c) ADD_DEMO(timer progs/demos/timer/timer.c) -# finally, if any demos are built, copy needed files to output directory -# (currently, thats just the input file for the Fractals demo) -IF(FREEGLUT_BUILD_DEMOS) - # 1) copy fractals.dat from freeglut/progs/demos/Fractals - IF(BUILD_SHARED_LIBS) - SET(Frac_target Fractals) - ELSE() - SET(Frac_target Fractals_static) - ENDIF() - GET_TARGET_PROPERTY(DEMO_OUTPUT_DIRECTORY ${Frac_target} RUNTIME_OUTPUT_DIRECTORY) - ADD_CUSTOM_COMMAND( - TARGET ${Frac_target} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - ${PROJECT_SOURCE_DIR}/progs/demos/Fractals/fractals.dat - ${DEMO_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} - ) -ENDIF() - # pkg-config support, to install at $(libdir)/pkgconfig # Define static build dependencies IF(WIN32) - SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32") -ELSEIF(ANDROID) - SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL") + SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32 -lm") +ELSEIF(FREEGLUT_GLES2) + IF(ANDROID) + SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL -lm") + ELSE() + SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL -lm") + ENDIF() +ELSEIF(FREEGLUT_GLES1) + IF(ANDROID) + SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv1_CM -lEGL -lm") + ELSE() + SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL -lm") + ENDIF() ELSE() - SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL") + SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm") ENDIF() # Client applications need to define FreeGLUT GLES version to # bootstrap headers inclusion in freeglut_std.h: +SET(PC_LIBNAME "glut") +SET(PC_FILENAME "freeglut.pc") IF(FREEGLUT_GLES2) SET(PC_CFLAGS "-DFREEGLUT_GLES2") + SET(PC_LIBNAME "freeglut-gles2") + SET(PC_FILENAME "freeglut-gles2.pc") ELSEIF(FREEGLUT_GLES1) SET(PC_CFLAGS "-DFREEGLUT_GLES1") + SET(PC_LIBNAME "freeglut-gles1") + SET(PC_FILENAME "freeglut-gles1.pc") ENDIF() CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/freeglut.pc.in ${CMAKE_BINARY_DIR}/freeglut.pc @ONLY) -INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION share/pkgconfig) +INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION share/pkgconfig/ RENAME ${PC_FILENAME}) # TODO: change the library and .pc name when building for GLES, # e.g. -lglut-GLES2