X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=19e67438e262e4ae03745c151eb8374cd8b6d235;hb=f0c130c0b11e28e62cbf2dd641133998463c9e8b;hp=fd27a7f0858187b2361e6ed440de13efc05b2f61;hpb=90da2f7da3d4d2dccf92fce7962ce2f097be06b5;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index fd27a7f..19e6743 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,17 @@ set(VERSION_MINOR 0) set(VERSION_PATCH 0) +# BUILD_SHARED_LIBS is already a standard CMake variable, but we need to +# re-declare it here so it will show up in the GUI. +# by default, we want to build both +OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) +OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) + +# 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) + + SET(FREEGLUT_HEADERS include/GL/freeglut.h include/GL/freeglut_ext.h @@ -47,14 +58,19 @@ SET(FREEGLUT_SRCS src/fg_videoresize.c src/fg_window.c ) -# Android port requires adding a version of these compatible with -# OpenGL ES (TODO): -IF(NOT ANDROID) +# TODO: OpenGL ES requires a compatible version of these files: +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() @@ -76,7 +92,7 @@ IF(WIN32) src/mswin/fg_window_mswin.c ${CMAKE_BINARY_DIR}/freeglut.rc # generated below from freeglut.rc.in ) - IF (NOT CMAKE_CL_64) + IF (MSVC AND NOT CMAKE_CL_64) # .def file only for 32bit Windows builds LIST(APPEND FREEGLUT_SRCS ${CMAKE_BINARY_DIR}/freeglutdll.def # generated below from src/freeglutdll.def.in @@ -88,25 +104,28 @@ ELSEIF(ANDROID) src/egl/fg_internal_egl.h src/egl/fg_display_egl.c src/egl/fg_init_egl.c + src/egl/fg_state_egl.c src/egl/fg_structure_egl.c + src/egl/fg_structure_egl.h 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_gamemode_android.c + src/android/fg_structure_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_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/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 @@ -122,24 +141,38 @@ ELSE() src/x11/fg_window_x11.c src/x11/fg_xinput_x11.c ) + 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_init_egl.c + src/egl/fg_state_egl.c + src/egl/fg_structure_egl.c + src/egl/fg_window_egl.c + ) + ELSE() + 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_window_x11_glx.c + src/x11/fg_window_x11_glx.h + ) + ENDIF() ENDIF() -# BUILD_SHARED_LIBS is already a standard CMake variable, but we need to -# re-declare it here so it will show up in the GUI. -# by default, we want to build both -OPTION(BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) -OPTION(BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) - -# 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) - +# For OpenGL ES (GLES): +# - compile with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly +# bootstrap headers inclusion in freeglut_std.h; these constants +# also need to be defined in client applications (e.g through +# pkg-config), but use GLES constants directly for all other needs +# - define GLES version-specific library IF(FREEGLUT_GLES2) - ADD_DEFINITIONS(-DGLESv2) + ADD_DEFINITIONS(-DFREEGLUT_GLES2) LIST(APPEND LIBS GLESv2 EGL) ELSEIF(FREEGLUT_GLES1) - ADD_DEFINITIONS(-DGLESv1) - LIST(APPEND LIBS GLESv1 EGL) + ADD_DEFINITIONS(-DFREEGLUT_GLES1) + LIST(APPEND LIBS GLESv1_CM EGL) ELSE() FIND_PACKAGE(OpenGL REQUIRED) LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) @@ -152,7 +185,7 @@ IF (NOT WIN32) ENDIF() IF(WIN32) - MESSAGE(WARNING "Insecure CRT warnings hidden (might want to fix these)") + # hide insecure CRT warnings, common practice ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF() @@ -263,15 +296,13 @@ ELSE() 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: + # seem to be meant for modifying CFLAGS: # '-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) @@ -346,3 +377,34 @@ IF(FREEGLUT_BUILD_DEMOS) ${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 -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 -lGL -lm") +ENDIF() +# Client applications need to define FreeGLUT GLES version to +# bootstrap headers inclusion in freeglut_std.h: +IF(FREEGLUT_GLES2) + SET(PC_CFLAGS "-DFREEGLUT_GLES2") +ELSEIF(FREEGLUT_GLES1) + SET(PC_CFLAGS "-DFREEGLUT_GLES1") +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) +# TODO: change the library and .pc name when building for GLES, +# e.g. -lglut-GLES2