mirror of https://git.wownero.com/dsc/mxe.git
update freeglut
This commit is contained in:
parent
a49aa6c62d
commit
ccae33d1c2
|
@ -2,80 +2,10 @@ This file is part of MXE. See LICENSE.md for licensing information.
|
||||||
|
|
||||||
Contains ad hoc patches for cross building.
|
Contains ad hoc patches for cross building.
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Boris Pek <tehnick-8@yandex.ru>
|
|
||||||
Date: Sat, 18 Jun 2016 16:24:52 +0300
|
|
||||||
Subject: [PATCH 1/3] Back compatibility with older freeglut packages in MXE
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 1111111..2222222 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -11,7 +11,7 @@ INCLUDE(GNUInstallDirs)
|
|
||||||
# CMAKE_ARCHIVE_OUTPUT_DIRECTORY instead.
|
|
||||||
# Static libraries end up in CMAKE_ARCHIVE_OUTPUT_DIRECTORY on all
|
|
||||||
# platforms.
|
|
||||||
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
|
|
||||||
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
|
|
||||||
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
|
|
||||||
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
|
|
||||||
|
|
||||||
@@ -53,9 +53,7 @@ ENDIF()
|
|
||||||
OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF)
|
|
||||||
|
|
||||||
# option to build either as "glut" (ON) or "freeglut" (OFF)
|
|
||||||
-IF(NOT WIN32)
|
|
||||||
- OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON)
|
|
||||||
-ENDIF()
|
|
||||||
+OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON)
|
|
||||||
|
|
||||||
|
|
||||||
SET(FREEGLUT_HEADERS
|
|
||||||
@@ -346,12 +344,18 @@ ENDIF()
|
|
||||||
|
|
||||||
|
|
||||||
IF(WIN32)
|
|
||||||
+ IF(FREEGLUT_REPLACE_GLUT)
|
|
||||||
+ SET(LIBNAME glut)
|
|
||||||
+ ELSE()
|
|
||||||
+ SET(LIBNAME freeglut)
|
|
||||||
+ ENDIF()
|
|
||||||
+
|
|
||||||
LIST(APPEND LIBS winmm)
|
|
||||||
IF(FREEGLUT_BUILD_SHARED_LIBS)
|
|
||||||
- SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS)
|
|
||||||
+ SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS OUTPUT_NAME ${LIBNAME})
|
|
||||||
ENDIF()
|
|
||||||
IF(FREEGLUT_BUILD_STATIC_LIBS)
|
|
||||||
- SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)
|
|
||||||
+ SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC OUTPUT_NAME ${LIBNAME})
|
|
||||||
# need to set machine:x64 for linker, at least for VC10, and
|
|
||||||
# doesn't hurt for older compilers:
|
|
||||||
# http://public.kitware.com/Bug/view.php?id=11240#c22768
|
|
||||||
@@ -514,12 +518,13 @@ ELSE()
|
|
||||||
ENDIF()
|
|
||||||
# Client applications need to define FreeGLUT GLES version to
|
|
||||||
# bootstrap headers inclusion in freeglut_std.h:
|
|
||||||
-SET(PC_LIBNAME "glut")
|
|
||||||
-SET(PC_FILENAME "freeglut.pc")
|
|
||||||
+SET(PC_LIBNAME "${LIBNAME}")
|
|
||||||
+SET(PC_FILENAME "${LIBNAME}.pc")
|
|
||||||
IF(FREEGLUT_GLES)
|
|
||||||
SET(PC_CFLAGS "-DFREEGLUT_GLES")
|
|
||||||
- SET(PC_LIBNAME "freeglut-gles")
|
|
||||||
- SET(PC_FILENAME "freeglut-gles.pc")
|
|
||||||
+ENDIF()
|
|
||||||
+IF(FREEGLUT_BUILD_STATIC_LIBS)
|
|
||||||
+ LIST(APPEND PC_CFLAGS -DFREEGLUT_STATIC)
|
|
||||||
ENDIF()
|
|
||||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeglut.pc.in ${CMAKE_BINARY_DIR}/freeglut.pc @ONLY)
|
|
||||||
INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ RENAME ${PC_FILENAME})
|
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Boris Nagaev <bnagaev@gmail.com>
|
From: Boris Nagaev <bnagaev@gmail.com>
|
||||||
Date: Thu, 14 Jul 2016 19:15:17 +0300
|
Date: Thu, 14 Jul 2016 19:15:17 +0300
|
||||||
Subject: [PATCH 2/3] add glu to requirements in .pc file
|
Subject: [PATCH 1/2] add glu to requirements in .pc file
|
||||||
|
|
||||||
glu.pc is generated by mxe-conf and it adds -lglu32 to linker flags.
|
glu.pc is generated by mxe-conf and it adds -lglu32 to linker flags.
|
||||||
libglu32.a defines gluUnProject and other symbols used by users of GLU.
|
libglu32.a defines gluUnProject and other symbols used by users of GLU.
|
||||||
|
@ -97,7 +27,7 @@ index 1111111..2222222 100644
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Mark Brand <mabrand@mabrand.nl>
|
From: Mark Brand <mabrand@mabrand.nl>
|
||||||
Date: Thu, 28 May 2020 12:36:54 +0200
|
Date: Thu, 28 May 2020 12:36:54 +0200
|
||||||
Subject: [PATCH 3/3] gcc 10 compatibility: add missing "extern"
|
Subject: [PATCH 2/2] gcc 10 compatibility: add missing "extern"
|
||||||
|
|
||||||
Related to:
|
Related to:
|
||||||
Default to -fno-common
|
Default to -fno-common
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
PKG := freeglut
|
PKG := freeglut
|
||||||
$(PKG)_WEBSITE := https://freeglut.sourceforge.io/
|
$(PKG)_WEBSITE := https://freeglut.sourceforge.io/
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 3.0.0
|
$(PKG)_VERSION := 3.2.1
|
||||||
$(PKG)_CHECKSUM := 2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2
|
$(PKG)_CHECKSUM := d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68
|
||||||
$(PKG)_SUBDIR := freeglut-$($(PKG)_VERSION)
|
$(PKG)_SUBDIR := freeglut-$($(PKG)_VERSION)
|
||||||
$(PKG)_FILE := freeglut-$($(PKG)_VERSION).tar.gz
|
$(PKG)_FILE := freeglut-$($(PKG)_VERSION).tar.gz
|
||||||
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE)
|
||||||
|
|
Loading…
Reference in New Issue