From 7be55239e73c306d8fa5543ff969dda2b26cf9d2 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 10 Sep 2012 21:45:06 +0200 Subject: [PATCH] Disabled native API by default. --- CMakeLists.txt | 8 +++++++- src/CMakeLists.txt | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14eaceb3..c72e00ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,7 @@ set(LIB_SUFFIX "" CACHE STRING "Takes an empty string or 64. Directory where lib option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ON) option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON) +option(GLFW_NATIVE_API "Build the GLFW native API" OFF) option(BUILD_SHARED_LIBS "Build shared libraries" OFF) find_package(OpenGL REQUIRED) @@ -259,7 +260,12 @@ configure_file(${GLFW_SOURCE_DIR}/src/config.h.in # The src directory's CMakeLists.txt file installs the library #-------------------------------------------------------------------- install(DIRECTORY include/GL DESTINATION include - FILES_MATCHING PATTERN glfw3.h PATTERN glfw3native.h) + FILES_MATCHING PATTERN glfw3.h) + +if (GLFW_NATIVE_API) + install(DIRECTORY include/GL DESTINATION include + FILES_MATCHING PATTERN glfw3native.h) +endif() install(FILES COPYING.txt readme.html DESTINATION share/doc/glfw-${GLFW_VERSION_FULL}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eaf37325..ec5508c2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,7 +10,11 @@ if (_GLFW_COCOA_NSGL) set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h) set(glfw_SOURCES ${common_SOURCES} cocoa_clipboard.m cocoa_fullscreen.m cocoa_gamma.c cocoa_init.m cocoa_input.m cocoa_joystick.m - cocoa_native.m cocoa_opengl.m cocoa_time.c cocoa_window.m) + cocoa_opengl.m cocoa_time.c cocoa_window.m) + + if (GLFW_NATIVE_API) + list(APPEND glfw_SOURCES cocoa_native.m) + endif() # For some reason, CMake doesn't know about .m set_source_files_properties(${glfw_SOURCES} PROPERTIES LANGUAGE C) @@ -18,14 +22,20 @@ elseif (_GLFW_WIN32_WGL) set(glfw_HEADERS ${common_HEADERS} win32_platform.h) set(glfw_SOURCES ${common_SOURCES} win32_clipboard.c win32_fullscreen.c win32_gamma.c win32_init.c win32_input.c win32_joystick.c - win32_native.c win32_opengl.c win32_time.c win32_window.c - win32_dllmain.c) + win32_opengl.c win32_time.c win32_window.c win32_dllmain.c) + + if (GLFW_NATIVE_API) + list(APPEND glfw_SOURCES win32_native.c) + endif() elseif (_GLFW_X11_GLX) set(glfw_HEADERS ${common_HEADERS} x11_platform.h) set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_fullscreen.c x11_gamma.c x11_init.c x11_input.c x11_joystick.c - x11_keysym2unicode.c x11_native.c x11_opengl.c x11_time.c - x11_window.c) + x11_keysym2unicode.c x11_opengl.c x11_time.c x11_window.c) + + if (GLFW_NATIVE_API) + list(APPEND glfw_SOURCES x11_native.c) + endif() endif() add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})