X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=d1c20e86dc77de652a9cb99d1751dfc81179fd75;hb=a0871c21cb859cea6f24802b6828352a211ab102;hp=71f4ef5864587a729f2520dab7552e6733c1026f;hpb=2c138d649ed28a1e9184ddfcd8c2f2d89300b824;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index 71f4ef5..d1c20e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,20 +53,30 @@ ENDIF() # OpenGL ES support OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF) +# option to build either as "glut" (ON) or "freeglut" (OFF) +IF(WIN32) + OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" OFF) +ELSE() + OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON) +ENDIF() + IF(NOT WIN32) # Wayland support OPTION(FREEGLUT_WAYLAND "Use Wayland (no X11)" OFF) - # option to build either as "glut" (ON) or "freeglut" (OFF) - OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON) ENDIF() SET(FREEGLUT_HEADERS include/GL/freeglut.h + include/GL/freeglut_ucall.h include/GL/freeglut_ext.h include/GL/freeglut_std.h - include/GL/glut.h ) +IF(FREEGLUT_REPLACE_GLUT) + LIST(APPEND FREEGLUT_SRCS + include/GL/glut.h + ) +ENDIF() SET(FREEGLUT_SRCS ${FREEGLUT_HEADERS} src/fg_callbacks.c @@ -81,6 +91,7 @@ SET(FREEGLUT_SRCS src/fg_init.c src/fg_init.h src/fg_internal.h + src/fg_callback_macros.h src/fg_input_devices.c src/fg_joystick.c src/fg_main.c @@ -315,6 +326,8 @@ IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) # Needed for multi-touch: CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) LIST(APPEND LIBS ${X11_Xinput_LIB}) + ELSE() + MESSAGE(FATAL_ERROR "Missing X11's XInput.h (X11/extensions/XInput.h)") ENDIF() ENDIF() IF(ANDROID) @@ -389,13 +402,22 @@ IF(FREEGLUT_BUILD_STATIC_LIBS) ENDIF() +SET(LIBNAME freeglut) IF(WIN32) + IF(FREEGLUT_REPLACE_GLUT) + SET(LIBNAME glut) + ENDIF() + LIST(APPEND LIBS winmm) IF(FREEGLUT_BUILD_SHARED_LIBS) TARGET_COMPILE_DEFINITIONS(freeglut PRIVATE FREEGLUT_EXPORTS) + SET_TARGET_PROPERTIES(freeglut PROPERTIES OUTPUT_NAME ${LIBNAME}) ENDIF() IF(FREEGLUT_BUILD_STATIC_LIBS) TARGET_COMPILE_DEFINITIONS(freeglut_static PUBLIC FREEGLUT_STATIC) + IF(FREEGLUT_REPLACE_GLUT) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) + ENDIF() # need to set machine:x64 for linker, at least for VC10, and # doesn't hurt for older compilers: # http://public.kitware.com/Bug/view.php?id=11240#c22768 @@ -414,20 +436,18 @@ ELSE() # or special-cased FreeGLUT long ago (e.g. .so.4 on OpenBSD), so # the lack of support for current:revision:age in CMake should # not be a problem. - # - the output library should be named glut so it'll be linkable with -lglut - # (unless FREEGLUT_REPLACE_GLUT is false). + # - the output library should be named glut so it'll be linkable with -lglut + # (unless FREEGLUT_REPLACE_GLUT is false). # - 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) IF(FREEGLUT_GLES) - SET(LIBNAME freeglut-gles) + SET(LIBNAME freeglut-gles) ELSE() - IF(FREEGLUT_REPLACE_GLUT) - SET(LIBNAME glut) - ELSE() - SET(LIBNAME freeglut) - ENDIF() - ENDIF() + IF(FREEGLUT_REPLACE_GLUT) + SET(LIBNAME glut) + ENDIF() + ENDIF() IF(FREEGLUT_BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION ${SO_MAJOR}.${SO_MINOR}.${SO_REV} SOVERSION ${SO_MAJOR} OUTPUT_NAME ${LIBNAME}) @@ -443,7 +463,9 @@ ELSE() # '-O0 -gstabs+' helps the currently buggy GDB port # 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") + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid") + ENDIF() SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") ENDIF() ENDIF() @@ -464,10 +486,17 @@ IF(FREEGLUT_BUILD_SHARED_LIBS) INCLUDES DESTINATION include ) IF(INSTALL_PDB) - INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/freeglut${CMAKE_DEBUG_POSTFIX}.pdb - DESTINATION bin - CONFIGURATIONS Debug - COMPONENT Devel) + IF(CMAKE_GENERATOR MATCHES "^Visual Studio") + INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/freeglut${CMAKE_DEBUG_POSTFIX}.pdb + DESTINATION bin + CONFIGURATIONS Debug + COMPONENT Devel) + ELSE() + INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/freeglut${CMAKE_DEBUG_POSTFIX}.pdb + DESTINATION bin + CONFIGURATIONS Debug + COMPONENT Devel) + ENDIF() ENDIF() ENDIF() IF(FREEGLUT_BUILD_STATIC_LIBS) @@ -533,6 +562,7 @@ IF(UNIX) ENDIF() ADD_DEMO(subwin progs/demos/subwin/subwin.c) ADD_DEMO(timer progs/demos/timer/timer.c) +ADD_DEMO(timer_callback progs/demos/timer_callback/timer.c) @@ -563,12 +593,13 @@ ELSE() 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") +SET(PC_LIBNAME ${LIBNAME}) +SET(PC_FILENAME "${LIBNAME}.pc") IF(FREEGLUT_GLES) SET(PC_CFLAGS "-DFREEGLUT_GLES") - SET(PC_LIBNAME "freeglut-gles") - SET(PC_FILENAME "freeglut-gles.pc") +ENDIF() +IF(FREEGLUT_BUILD_STATIC_LIBS) + LIST(APPEND PC_CFLAGS -DFREEGLUT_STATIC) ENDIF() CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeglut.pc.in ${CMAKE_BINARY_DIR}/freeglut.pc @ONLY) INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ RENAME ${PC_FILENAME} COMPONENT Devel)