diff options
| author | Sergey Perepelitsa <non_2001@mail.ru> | 2015-02-18 21:24:36 (GMT) |
|---|---|---|
| committer | Sergey Perepelitsa <non_2001@mail.ru> | 2015-03-14 17:16:18 (GMT) |
| commit | 85cb661e4408415836ca4a05e3f6aab1aaef7e6e (patch) | |
| tree | 5c818c99546958ef795f532265cffe478625f7d4 | |
| parent | fc2f44482f524be8ad61239f8bbd13c38ba6d8b7 (diff) | |
| download | mxe-85cb661e4408415836ca4a05e3f6aab1aaef7e6e.zip mxe-85cb661e4408415836ca4a05e3f6aab1aaef7e6e.tar.gz mxe-85cb661e4408415836ca4a05e3f6aab1aaef7e6e.tar.bz2 | |
GLFW updated to version 3.1
| -rw-r--r-- | src/glfw3-1-fixes.patch | 34 | ||||
| -rw-r--r-- | src/glfw3.mk | 4 |
2 files changed, 2 insertions, 36 deletions
diff --git a/src/glfw3-1-fixes.patch b/src/glfw3-1-fixes.patch deleted file mode 100644 index 3112cdf..0000000 --- a/src/glfw3-1-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Add option to install pkg-config file - ---- a/CMakeLists.txt 2013-12-31 20:06:18.000000000 +0100 -+++ b/CMakeLists.txt 2014-10-12 21:02:16.415982168 +0200 -@@ -15,6 +15,7 @@ - option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON) - option(GLFW_BUILD_DOCS "Build the GLFW documentation" ON) - option(GLFW_INSTALL "Generate installation target" ON) -+option(GLFW_INSTALL_PKG_CONFIG "Install pkg-config file" OFF) - option(GLFW_DOCUMENT_INTERNALS "Include internals in documentation" OFF) - - if (WIN32) -@@ -392,7 +393,7 @@ - configure_file(${GLFW_SOURCE_DIR}/src/glfwConfigVersion.cmake.in - ${GLFW_BINARY_DIR}/src/glfwConfigVersion.cmake @ONLY) - --if (UNIX) -+if (UNIX OR GLFW_INSTALL_PKG_CONFIG) - configure_file(${GLFW_SOURCE_DIR}/src/glfw3.pc.in - ${GLFW_BINARY_DIR}/src/glfw3.pc @ONLY) - endif() -@@ -428,6 +429,9 @@ - - if (UNIX) - install(EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX}/cmake/glfw) -+ endif() -+ -+ if (UNIX OR GLFW_INSTALL_PKG_CONFIG) - install(FILES ${GLFW_BINARY_DIR}/src/glfw3.pc - DESTINATION lib${LIB_SUFFIX}/pkgconfig) - endif() diff --git a/src/glfw3.mk b/src/glfw3.mk index 36816fa..6358727 100644 --- a/src/glfw3.mk +++ b/src/glfw3.mk @@ -3,8 +3,8 @@ PKG := glfw3 $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.4 -$(PKG)_CHECKSUM := 9b04309418ccbc74b2115d11198b7912669814ee +$(PKG)_VERSION := 3.1 +$(PKG)_CHECKSUM := 32f2dcc188694fb5823e24cc65c8f69f32f58bb1 $(PKG)_SUBDIR := glfw-$($(PKG)_VERSION) $(PKG)_FILE := glfw-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/glfw/glfw/$($(PKG)_VERSION)/$($(PKG)_FILE) |