X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=b6cb5232afd0e60a49fcf9a43f4bd54f0f821a83;hb=2e441bbb4f32a3e53ee07f495ced7d8b7c37ae79;hp=4f28280ba5b23ca74073defd70f016dd471c8825;hpb=94f74066a775daea60fd2d26e9fd02b313ff1977;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f28280..b6cb523 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,69 +9,93 @@ SET(FREEGLUT_HEADERS ) SET(FREEGLUT_SRCS ${FREEGLUT_HEADERS} - src/Common/freeglut_callbacks.c - src/Common/freeglut_cursor.c - src/Common/freeglut_display.c - src/Common/freeglut_ext.c - src/Common/freeglut_font.c - src/Common/freeglut_font_data.c - src/Common/freeglut_gamemode.c - src/Common/freeglut_geometry.c - src/Common/freeglut_init.c - src/Common/freeglut_internal.h - src/Common/freeglut_input_devices.c - src/Common/freeglut_joystick.c - src/Common/freeglut_main.c - src/Common/freeglut_menu.c - src/Common/freeglut_misc.c - src/Common/freeglut_overlay.c - src/Common/freeglut_spaceball.c - src/Common/freeglut_state.c - src/Common/freeglut_stroke_mono_roman.c - src/Common/freeglut_stroke_roman.c - src/Common/freeglut_structure.c - src/Common/freeglut_teapot.c - src/Common/freeglut_videoresize.c - src/Common/freeglut_window.c + src/fg_callbacks.c + src/fg_cursor.c + src/fg_display.c + src/fg_ext.c + src/fg_font_data.c + src/fg_gamemode.c + src/fg_init.c + src/fg_internal.h + src/fg_input_devices.c + src/fg_joystick.c + src/fg_main.c + src/fg_misc.c + src/fg_overlay.c + src/fg_spaceball.c + src/fg_state.c + src/fg_stroke_mono_roman.c + src/fg_stroke_roman.c + src/fg_structure.c + src/fg_videoresize.c + src/fg_window.c ) +# 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 +) +ENDIF() 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 - src/mswin/freeglut_gamemode_mswin.c - src/mswin/freeglut_init_mswin.c - src/mswin/freeglut_internal_mswin.h - src/mswin/freeglut_input_devices_mswin.c - src/mswin/freeglut_joystick_mswin.c - src/mswin/freeglut_main_mswin.c - src/mswin/freeglut_menu_mswin.c - src/mswin/freeglut_spaceball_mswin.c - src/mswin/freeglut_state_mswin.c - src/mswin/freeglut_structure_mswin.c - src/mswin/freeglut_window_mswin.c + src/mswin/fg_cursor_mswin.c + src/mswin/fg_display_mswin.c + src/mswin/fg_ext_mswin.c + src/mswin/fg_gamemode_mswin.c + src/mswin/fg_init_mswin.c + src/mswin/fg_internal_mswin.h + src/mswin/fg_input_devices_mswin.c + src/mswin/fg_joystick_mswin.c + src/mswin/fg_main_mswin.c + src/mswin/fg_menu_mswin.c + src/mswin/fg_spaceball_mswin.c + src/mswin/fg_state_mswin.c + src/mswin/fg_structure_mswin.c + src/mswin/fg_window_mswin.c +) +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/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_gamemode_android.c + src/android/fg_input_devices_android.c + src/android/fg_joystick_android.c + src/android/fg_main_android.c + src/android/fg_spaceball_android.c + src/android/fg_state_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/freeglut_cursor_x11.c - src/x11/freeglut_display_x11.c - src/x11/freeglut_ext_x11.c - src/x11/freeglut_gamemode_x11.c - src/x11/freeglut_glutfont_definitions_x11.c - src/x11/freeglut_init_x11.c - src/x11/freeglut_internal_x11.h - src/x11/freeglut_input_devices_x11.c - src/x11/freeglut_joystick_x11.c - src/x11/freeglut_main_x11.c - src/x11/freeglut_menu_x11.c - src/x11/freeglut_spaceball_x11.c - src/x11/freeglut_state_x11.c - src/x11/freeglut_structure_x11.c - src/x11/freeglut_window_x11.c - src/x11/freeglut_xinput_x11.c + 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 + src/x11/fg_init_x11.c + src/x11/fg_internal_x11.h + src/x11/fg_input_devices_x11.c + src/x11/fg_joystick_x11.c + src/x11/fg_main_x11.c + src/x11/fg_menu_x11.c + src/x11/fg_spaceball_x11.c + src/x11/fg_state_x11.c + src/x11/fg_structure_x11.c + src/x11/fg_window_x11.c + src/x11/fg_xinput_x11.c ) @@ -86,9 +110,21 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) -FIND_PACKAGE(OpenGL REQUIRED) -INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) -LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) +# OpenGL ES support +OPTION(FREEGLUT_GLES1 "Use OpenGL ES 1.x (requires EGL)" OFF) +OPTION(FREEGLUT_GLES2 "Use OpenGL ES 2.x (requires EGL) (overrides BUILD_GLES1)" OFF) + +IF(FREEGLUT_GLES2) + ADD_DEFINITIONS(-DGLESv2) + LIST(APPEND LIBS GLESv2 EGL) +ELSEIF(FREEGLUT_GLES1) + ADD_DEFINITIONS(-DGLESv1) + LIST(APPEND LIBS GLESv1 EGL) +ELSE() + FIND_PACKAGE(OpenGL REQUIRED) + LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) +ENDIF() # lib m for math, not needed on windows IF (NOT WIN32) @@ -100,7 +136,7 @@ IF(WIN32) ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() -if(UNIX) +if(UNIX AND NOT ANDROID) FIND_PACKAGE(X11 REQUIRED) LIST(APPEND LIBS ${X11_LIBRARIES}) IF(X11_Xrandr_FOUND) @@ -119,6 +155,7 @@ ENDIF() INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) +INCLUDE(CheckTypeSize) CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) @@ -129,8 +166,29 @@ CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) CHECK_INCLUDE_FILES(errno.h HAVE_ERRNO_H) CHECK_INCLUDE_FILES(usbhid.h HAVE_USBHID_H) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -CHECK_FUNCTION_EXISTS(vfprintf HAVE_VFPRINTF) -CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT) +CHECK_FUNCTION_EXISTS(vfprintf HAVE_VFPRINTF) +CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT) +CHECK_FUNCTION_EXISTS(XParseGeometry HAVE_XPARSEGEOMETRY) +IF (NOT HAVE_XPARSEGEOMETRY) + LIST(APPEND FREEGLUT_SRCS + src/util/xparsegeometry_repl.c + src/util/xparsegeometry_repl.h) + SET(NEED_XPARSEGEOMETRY_IMPL TRUE) +ENDIF() +# decide on suitable type for internal time keeping, 64-bit if possible +CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) +CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) +IF (NOT (HAVE_STDINT_H OR HAVE_INTTYPES_H)) + IF (MSVC) + # Some old Microsoft VC don't support unsigned long long, but all we + # care about support unsigned __int64, so test for presence of that + # type + CHECK_TYPE_SIZE("unsigned __int64" U__INT64 BUILTIN_TYPES_ONLY) + ELSEIF() + CHECK_TYPE_SIZE("unsigned long long" ULONG_LONG BUILTIN_TYPES_ONLY) + ENDIF() +ENDIF() + # 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. @@ -151,21 +209,41 @@ 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) + LIST(APPEND FREEGLUT_SRCS freeglut.rc) + IF (NOT CMAKE_CL_64) + # .def file only for 32bit Windows builds + LIST(APPEND FREEGLUT_SRCS src/Common/freeglutdll.def) + ENDIF() + SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) + ENDIF() + IF(BUILD_STATIC_LIBS) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) ENDIF() ELSE() # on UNIX we need to make sure: - # - all shared libraries must have a soname/version + # - all shared libraries must have a soname/version, see : + # http://sourceware.org/autobook/autobook/autobook_91.html#SEC91 + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html + # Current: -version-info 12:0:9 -> 3.9.0 # - the output library should be named glut so it'll be linkable with -lglut # - 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(ANDROID) + # Not in CMake toolchain file, because the toolchain + # file is called several times and generally doesn't + # seem to be meant for it: + # '-mandroid' is not mandatory but doesn't hurt + # '-O0 -gstabs+' helps the currently buggy GDB port + # '-DANDROID' is the Android build system convention + # Too late to manipulate ENV: SET(ENV{CFLAGS} "$ENV{CFLAGS} -mandroid") + # Not using _INIT variables, they seem to be used internally only + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") + ADD_DEFINITIONS(-DANDROID) + ENDIF() ENDIF() IF(BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES(freeglut ${LIBS}) @@ -202,6 +280,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() @@ -218,5 +297,4 @@ ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c progs/demos/spaceball/vmath.c progs/demos/spaceball/vmath.h) ADD_DEMO(subwin progs/demos/subwin/subwin.c) - - +ADD_DEMO(timer progs/demos/timer/timer.c)