X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=28bab9dbf0c93bfd5966b4b0a009cef06d161490;hb=ba0d46aa5599d279431a91fd5ccbcd9d59920203;hp=9a9e9308232e001f71c272f7676197b997182b92;hpb=fade9e761e4438d60759f9a9b6cf679ff7e9c1d7;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a9e930..28bab9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,17 +19,17 @@ set(VERSION_MINOR 0) set(VERSION_PATCH 0) -# BUILD_SHARED_LIBS is already a standard CMake variable, but we need to +# FREEGLUT_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) +OPTION(FREEGLUT_BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) +OPTION(FREEGLUT_BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) # option for whether warnings and errors should be printed -OPTION(FREEGLUT_ERRORS "Lib prints errors to stderr" ON) -#MARK_AS_ADVANCED(FREEGLUT_ERRORS) -OPTION(FREEGLUT_WARNINGS "Lib prints warnings to stderr" ON) -#MARK_AS_ADVANCED(FREEGLUT_WARNINGS) +OPTION(FREEGLUT_PRINT_ERRORS "Lib prints errors to stderr" ON) +#MARK_AS_ADVANCED(FREEGLUT_PRINT_ERRORS) +OPTION(FREEGLUT_PRINT_WARNINGS "Lib prints warnings to stderr" ON) +#MARK_AS_ADVANCED(FREEGLUT_PRINT_WARNINGS) # option to also copy .pdb files to install directory when executing # INSTALL target @@ -59,6 +59,7 @@ SET(FREEGLUT_SRCS src/fg_ext.c src/fg_font_data.c src/fg_gamemode.c + src/fg_geometry.c src/fg_gl2.c src/fg_gl2.h src/fg_init.c @@ -74,6 +75,8 @@ SET(FREEGLUT_SRCS src/fg_stroke_mono_roman.c src/fg_stroke_roman.c src/fg_structure.c + src/fg_teapot.c + src/fg_teapot_data.h src/fg_videoresize.c src/fg_window.c ) @@ -82,13 +85,9 @@ IF(NOT FREEGLUT_GLES2 AND NOT FREEGLUT_GLES1) LIST(APPEND FREEGLUT_SRCS src/fg_font.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() @@ -119,25 +118,42 @@ IF(WIN32) ) ENDIF() -ELSEIF(ANDROID) +ELSEIF(ANDROID OR BLACKBERRY) + # BlackBerry and Android share some similar design concepts and ideas, as with many mobile devices. + # As such, some classes can be shared between the two. XXX: Possibly rename shareable classes to + # a more generic name. *_stub? *_mobile? LIST(APPEND FREEGLUT_SRCS - src/android/native_app_glue/android_native_app_glue.c - src/android/native_app_glue/android_native_app_glue.h - 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 ) + IF(ANDROID) + LIST(APPEND FREEGLUT_SRCS + src/android/native_app_glue/android_native_app_glue.c + src/android/native_app_glue/android_native_app_glue.h + src/android/fg_internal_android.h + src/android/fg_init_android.c + src/android/fg_input_devices_android.c + src/android/fg_main_android.c + src/android/fg_main_android.h + src/android/fg_runtime_android.c + src/android/fg_state_android.c + src/android/fg_structure_android.c + src/android/fg_window_android.c + ) + ELSE() + LIST(APPEND FREEGLUT_SRCS + src/blackberry/fg_internal_blackberry.h + src/blackberry/fg_init_blackberry.c + src/x11/fg_input_devices_x11.c + src/blackberry/fg_main_blackberry.c + src/blackberry/fg_state_blackberry.c + src/blackberry/fg_structure_blackberry.c + src/blackberry/fg_window_blackberry.c + ) + ENDIF() ELSE() LIST(APPEND FREEGLUT_SRCS src/x11/fg_cursor_x11.c @@ -220,14 +236,14 @@ ENDIF() IF(CMAKE_COMPILER_IS_GNUCC) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - IF(!ANDROID) + IF(NOT(ANDROID OR BLACKBERRY)) # 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) INCLUDE(CheckIncludeFiles) -IF(UNIX AND NOT ANDROID) +IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) FIND_PACKAGE(X11 REQUIRED) LIST(APPEND LIBS ${X11_LIBRARIES}) IF(X11_Xrandr_FOUND) @@ -252,6 +268,11 @@ IF(ANDROID) # -landroid for ANativeWindow # -llog for native Android logging LIST(APPEND LIBS android log) +ELSEIF(BLACKBERRY) + # -lbps for event loop + # -lslog2 for logging + # -screen for native screen + LIST(APPEND LIBS bps slog2 screen) ENDIF() INCLUDE(CheckFunctionExists) @@ -305,20 +326,20 @@ IF(WIN32) ENDIF() ENDIF() -IF(BUILD_SHARED_LIBS) +IF(FREEGLUT_BUILD_SHARED_LIBS) ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) ENDIF() -IF(BUILD_STATIC_LIBS) +IF(FREEGLUT_BUILD_STATIC_LIBS) ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS}) ENDIF() IF(WIN32) LIST(APPEND LIBS winmm) - IF(BUILD_SHARED_LIBS) + IF(FREEGLUT_BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) ENDIF() - IF(BUILD_STATIC_LIBS) + IF(FREEGLUT_BUILD_STATIC_LIBS) SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) # need to set machine:x64 for linker, at least for VC10, and # doesn't hurt for older compilers: @@ -350,8 +371,12 @@ 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(FREEGLUT_BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME ${LIBNAME}) + ENDIF() + IF(FREEGLUT_BUILD_STATIC_LIBS) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) + ENDIF() IF(ANDROID) # Not in CMake toolchain file, because the toolchain # file is called several times and generally doesn't @@ -364,14 +389,14 @@ ELSE() SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") ENDIF() ENDIF() -IF(BUILD_SHARED_LIBS) +IF(FREEGLUT_BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES(freeglut ${LIBS}) ENDIF() -IF(BUILD_STATIC_LIBS) +IF(FREEGLUT_BUILD_STATIC_LIBS) TARGET_LINK_LIBRARIES(freeglut_static ${LIBS}) ENDIF() -IF(BUILD_SHARED_LIBS) +IF(FREEGLUT_BUILD_SHARED_LIBS) INSTALL(TARGETS freeglut RUNTIME DESTINATION bin LIBRARY DESTINATION lib @@ -383,7 +408,7 @@ IF(BUILD_SHARED_LIBS) CONFIGURATIONS Debug) ENDIF() ENDIF() -IF(BUILD_STATIC_LIBS) +IF(FREEGLUT_BUILD_STATIC_LIBS) INSTALL(TARGETS freeglut_static RUNTIME DESTINATION bin LIBRARY DESTINATION lib @@ -410,14 +435,14 @@ ENDIF() MACRO(ADD_DEMO name) IF( FREEGLUT_BUILD_DEMOS ) - IF(BUILD_SHARED_LIBS) + IF(FREEGLUT_BUILD_SHARED_LIBS) ADD_EXECUTABLE(${name} ${ARGN}) TARGET_LINK_LIBRARIES(${name} ${DEMO_LIBS} freeglut) IF(WIN32 AND MSVC) SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX d) ENDIF() ENDIF() - IF(BUILD_STATIC_LIBS) + IF(FREEGLUT_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) @@ -461,12 +486,16 @@ IF(WIN32) ELSEIF(FREEGLUT_GLES2) IF(ANDROID) SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL -lm") + ELSEIF(BLACKBERRY) + SET(PC_LIBS_PRIVATE "-lbps -lslog2 -lscreen -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") + ELSEIF(BLACKBERRY) + SET(PC_LIBS_PRIVATE "-lbps -lslog2 -lscreen -lGLESv1_CM -lEGL -lm") ELSE() SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL -lm") ENDIF()