From cedd84f839764910f7f7dd5cd97a3ace8c9cc5f7 Mon Sep 17 00:00:00 2001 From: Abdo Roig-Maranges Date: Tue, 27 Dec 2016 20:29:03 +0100 Subject: [PATCH 1/3] cmake: only install PDB files with msvc Otherwise cmake windows builds with the mingw compiler are broken. --- build/cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 99495ed..f192009 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -194,7 +194,7 @@ install(FILES ${GLEW_DIR}/glew.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) -if(WIN32 AND (NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1")) +if(WIN32 AND MSVC AND (NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1")) install( FILES $ DESTINATION ${CMAKE_INSTALL_LIBDIR} From 239fde0a43f767a5dba5e9e08afbea7cd886a725 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 8 Jan 2017 10:30:28 +1000 Subject: [PATCH 2/3] Update copyright notice to 2017 --- auto/src/glew_license.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/src/glew_license.h b/auto/src/glew_license.h index 77e2b29..f257ed2 100644 --- a/auto/src/glew_license.h +++ b/auto/src/glew_license.h @@ -1,6 +1,6 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2016, Nigel Stewart +** Copyright (C) 2008-2017, Nigel Stewart ** Copyright (C) 2002-2008, Milan Ikits ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev From 6ee72f2fced52dd0adfca52e40cea19129da2f9b Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 8 Jan 2017 11:31:30 +1000 Subject: [PATCH 3/3] make build: Updated config.guess --- config/config.guess | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/config/config.guess b/config/config.guess index c4bd827..bbd48b6 100755 --- a/config/config.guess +++ b/config/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-05-15' +timestamp='2017-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1000,6 +1000,9 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1032,6 +1035,9 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;;