aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitri Shuralyov <shurcooL@gmail.com>2015-01-18 13:35:45 -0800
committerDmitri Shuralyov <shurcooL@gmail.com>2015-02-21 18:51:42 -0800
commit237eb14cdda546979ee154cd3ca99defa0d459e7 (patch)
treed6a48ac8206fdfed3a34601e72e66588136e9349
parent9faad1febdcc20ff53e4821e759ceea3abeacd94 (diff)
downloadglfw-237eb14cdda546979ee154cd3ca99defa0d459e7.tar.gz
Remove remaining unused CMake files from vendored glfw folder.
See https://github.com/go-gl/glfw3/pull/110#issuecomment-70427149.
-rw-r--r--glfw/src/CMakeLists.txt96
-rw-r--r--glfw/src/glfw3.pc.in13
-rw-r--r--glfw/src/glfw3Config.cmake.in15
-rw-r--r--glfw/src/glfw_config.h.in87
4 files changed, 0 insertions, 211 deletions
diff --git a/glfw/src/CMakeLists.txt b/glfw/src/CMakeLists.txt
deleted file mode 100644
index 77a8501..0000000
--- a/glfw/src/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-
-include_directories("${GLFW_SOURCE_DIR}/src"
- "${GLFW_BINARY_DIR}/src"
- ${glfw_INCLUDE_DIRS})
-
-add_definitions(-D_GLFW_USE_CONFIG_H)
-
-set(common_HEADERS internal.h
- "${GLFW_BINARY_DIR}/src/glfw_config.h"
- "${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h"
- "${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h")
-set(common_SOURCES context.c init.c input.c monitor.c window.c)
-
-if (_GLFW_COCOA)
- set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h iokit_joystick.h
- posix_tls.h)
- set(glfw_SOURCES ${common_SOURCES} cocoa_init.m cocoa_monitor.m
- cocoa_window.m iokit_joystick.m mach_time.c posix_tls.c)
-elseif (_GLFW_WIN32)
- set(glfw_HEADERS ${common_HEADERS} win32_platform.h win32_tls.h
- winmm_joystick.h)
- set(glfw_SOURCES ${common_SOURCES} win32_init.c win32_monitor.c win32_time.c
- win32_tls.c win32_window.c winmm_joystick.c)
-elseif (_GLFW_X11)
- set(glfw_HEADERS ${common_HEADERS} x11_platform.h xkb_unicode.h
- linux_joystick.h posix_time.h posix_tls.h)
- set(glfw_SOURCES ${common_SOURCES} x11_init.c x11_monitor.c x11_window.c
- xkb_unicode.c linux_joystick.c posix_time.c posix_tls.c)
-elseif (_GLFW_WAYLAND)
- set(glfw_HEADERS ${common_HEADERS} wl_platform.h linux_joystick.h
- posix_time.h posix_tls.h xkb_unicode.h)
- set(glfw_SOURCES ${common_SOURCES} wl_init.c wl_monitor.c wl_window.c
- linux_joystick.c posix_time.c posix_tls.c xkb_unicode.c)
-elseif (_GLFW_MIR)
- set(glfw_HEADERS ${common_HEADERS} mir_platform.h linux_joystick.h
- posix_time.h posix_tls.h xkb_unicode.h)
- set(glfw_SOURCES ${common_SOURCES} mir_init.c mir_monitor.c mir_window.c
- linux_joystick.c posix_time.c posix_tls.c xkb_unicode.c)
-endif()
-
-if (_GLFW_EGL)
- list(APPEND glfw_HEADERS ${common_HEADERS} egl_context.h)
- list(APPEND glfw_SOURCES ${common_SOURCES} egl_context.c)
-elseif (_GLFW_NSGL)
- list(APPEND glfw_HEADERS ${common_HEADERS} nsgl_context.h)
- list(APPEND glfw_SOURCES ${common_SOURCES} nsgl_context.m)
-elseif (_GLFW_WGL)
- list(APPEND glfw_HEADERS ${common_HEADERS} wgl_context.h)
- list(APPEND glfw_SOURCES ${common_SOURCES} wgl_context.c)
-elseif (_GLFW_X11)
- list(APPEND glfw_HEADERS ${common_HEADERS} glx_context.h)
- list(APPEND glfw_SOURCES ${common_SOURCES} glx_context.c)
-endif()
-
-if (APPLE)
- # For some reason, CMake doesn't know about .m
- set_source_files_properties(${glfw_SOURCES} PROPERTIES LANGUAGE C)
-endif()
-
-add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
-set_target_properties(glfw PROPERTIES
- OUTPUT_NAME "${GLFW_LIB_NAME}"
- VERSION ${GLFW_VERSION}
- SOVERSION ${GLFW_VERSION_MAJOR}
- POSITION_INDEPENDENT_CODE ON
- FOLDER "GLFW3")
-
-if (BUILD_SHARED_LIBS)
- if (WIN32)
- # The GLFW DLL needs a special compile-time macro and import library name
- set_target_properties(glfw PROPERTIES PREFIX "" IMPORT_PREFIX "")
-
- if (MINGW)
- set_target_properties(glfw PROPERTIES IMPORT_SUFFIX "dll.a")
- else()
- set_target_properties(glfw PROPERTIES IMPORT_SUFFIX "dll.lib")
- endif()
- elseif (APPLE)
- # Append -fno-common to the compile flags to work around a bug in
- # Apple's GCC
- get_target_property(glfw_CFLAGS glfw COMPILE_FLAGS)
- if (NOT glfw_CFLAGS)
- set(glfw_CFLAGS "")
- endif()
- set_target_properties(glfw PROPERTIES
- COMPILE_FLAGS "${glfw_CFLAGS} -fno-common"
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
- endif()
-
- target_link_libraries(glfw ${glfw_LIBRARIES})
-endif()
-
-if (GLFW_INSTALL)
- install(TARGETS glfw EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX})
-endif()
-
diff --git a/glfw/src/glfw3.pc.in b/glfw/src/glfw3.pc.in
deleted file mode 100644
index f2e4d97..0000000
--- a/glfw/src/glfw3.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-includedir=${prefix}/include
-libdir=${exec_prefix}/lib@LIB_SUFFIX@
-
-Name: GLFW
-Description: A multi-platform library for OpenGL, window and input
-Version: @GLFW_VERSION_FULL@
-URL: http://www.glfw.org/
-Requires.private: @GLFW_PKG_DEPS@
-Libs: -L${libdir} -l@GLFW_LIB_NAME@
-Libs.private: @GLFW_PKG_LIBS@
-Cflags: -I${includedir}
diff --git a/glfw/src/glfw3Config.cmake.in b/glfw/src/glfw3Config.cmake.in
deleted file mode 100644
index d34df06..0000000
--- a/glfw/src/glfw3Config.cmake.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# - Config file for the glfw3 package
-# It defines the following variables
-# GLFW3_INCLUDE_DIR, the path where GLFW headers are located
-# GLFW3_LIBRARY_DIR, folder in which the GLFW library is located
-# GLFW3_LIBRARY, library to link against to use GLFW
-
-set(GLFW3_VERSION "@GLFW_VERSION_FULL@")
-
-@PACKAGE_INIT@
-
-set_and_check(GLFW3_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/include")
-set_and_check(GLFW3_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@")
-
-find_library(GLFW3_LIBRARY "@GLFW_LIB_NAME@" HINTS ${GLFW3_LIBRARY_DIR})
-
diff --git a/glfw/src/glfw_config.h.in b/glfw/src/glfw_config.h.in
deleted file mode 100644
index 485cac5..0000000
--- a/glfw/src/glfw_config.h.in
+++ /dev/null
@@ -1,87 +0,0 @@
-//========================================================================
-// GLFW 3.1 - www.glfw.org
-//------------------------------------------------------------------------
-// Copyright (c) 2010 Camilla Berglund <elmindreda@elmindreda.org>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would
-// be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not
-// be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-// distribution.
-//
-//========================================================================
-// As glfw_config.h.in, this file is used by CMake to produce the
-// glfw_config.h configuration header file. If you are adding a feature
-// requiring conditional compilation, this is where to add the macro.
-//========================================================================
-// As glfw_config.h, this file defines compile-time option macros for a
-// specific platform and development environment. If you are using the
-// GLFW CMake files, modify glfw_config.h.in instead of this file. If you
-// are using your own build system, make this file define the appropriate
-// macros in whatever way is suitable.
-//========================================================================
-
-// Define this to 1 if building GLFW for X11
-#cmakedefine _GLFW_X11
-// Define this to 1 if building GLFW for Win32
-#cmakedefine _GLFW_WIN32
-// Define this to 1 if building GLFW for Cocoa
-#cmakedefine _GLFW_COCOA
-// Define this to 1 if building GLFW for Wayland
-#cmakedefine _GLFW_WAYLAND
-// Define this to 1 if building GLFW for Mir
-#cmakedefine _GLFW_MIR
-
-// Define this to 1 if building GLFW for EGL
-#cmakedefine _GLFW_EGL
-// Define this to 1 if building GLFW for GLX
-#cmakedefine _GLFW_GLX
-// Define this to 1 if building GLFW for WGL
-#cmakedefine _GLFW_WGL
-// Define this to 1 if building GLFW for NSGL
-#cmakedefine _GLFW_NSGL
-
-// Define this to 1 if building as a shared library / dynamic library / DLL
-#cmakedefine _GLFW_BUILD_DLL
-
-// Define this to 1 if glfwSwapInterval should ignore DWM compositing status
-#cmakedefine _GLFW_USE_DWM_SWAP_INTERVAL
-// Define this to 1 to force use of high-performance GPU on Optimus systems
-#cmakedefine _GLFW_USE_OPTIMUS_HPG
-
-// Define this to 1 if glXGetProcAddress is available
-#cmakedefine _GLFW_HAS_GLXGETPROCADDRESS
-// Define this to 1 if glXGetProcAddressARB is available
-#cmakedefine _GLFW_HAS_GLXGETPROCADDRESSARB
-// Define this to 1 if glXGetProcAddressEXT is available
-#cmakedefine _GLFW_HAS_GLXGETPROCADDRESSEXT
-// Define this to 1 if dlopen is available
-#cmakedefine _GLFW_HAS_DLOPEN
-
-// Define this to 1 if glfwInit should change the current directory
-#cmakedefine _GLFW_USE_CHDIR
-// Define this to 1 if glfwCreateWindow should populate the menu bar
-#cmakedefine _GLFW_USE_MENUBAR
-// Define this to 1 if windows should use full resolution on Retina displays
-#cmakedefine _GLFW_USE_RETINA
-
-// Define this to 1 if using OpenGL as the client library
-#cmakedefine _GLFW_USE_OPENGL
-// Define this to 1 if using OpenGL ES 1.1 as the client library
-#cmakedefine _GLFW_USE_GLESV1
-// Define this to 1 if using OpenGL ES 2.0 as the client library
-#cmakedefine _GLFW_USE_GLESV2
-