diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-07-14 21:02:25 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-07-16 11:27:59 (GMT) |
| commit | fc07fffb853f1d80291251a970a457dd952fa19e (patch) | |
| tree | 4c2191b663bf4964fc1b0426ddc167a935fdce3e /src | |
| parent | 80a79f80d6459f99bd9736d26982b51c54a3cee8 (diff) | |
| download | mxe-fc07fffb853f1d80291251a970a457dd952fa19e.zip mxe-fc07fffb853f1d80291251a970a457dd952fa19e.tar.gz mxe-fc07fffb853f1d80291251a970a457dd952fa19e.tar.bz2 | |
freeglut: add glu to requirements in .pc file
Fix https://github.com/mxe/mxe/issues/1434
See https://github.com/mxe/mxe/pull/1429
See http://stackoverflow.com/a/17451000
Diffstat (limited to 'src')
| -rw-r--r-- | src/freeglut-1-fixes.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/freeglut-1-fixes.patch b/src/freeglut-1-fixes.patch index de0f0c0..6848e6c 100644 --- a/src/freeglut-1-fixes.patch +++ b/src/freeglut-1-fixes.patch @@ -72,3 +72,25 @@ index 1111111..2222222 100644 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: Boris Nagaev <bnagaev@gmail.com> +Date: Thu, 14 Jul 2016 19:15:17 +0300 +Subject: [PATCH] add glu to requirements in .pc file + +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. + +Fix https://github.com/mxe/mxe/issues/1434 +See https://github.com/mxe/mxe/pull/1429 +See http://stackoverflow.com/a/17451000 + +diff --git a/freeglut.pc.in b/freeglut.pc.in +index 1111111..2222222 100644 +--- a/freeglut.pc.in ++++ b/freeglut.pc.in +@@ -8,3 +8,4 @@ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ + Libs: -L${libdir} -l@PC_LIBNAME@ + Libs.private: @PC_LIBS_PRIVATE@ + Cflags: -I${includedir} @PC_CFLAGS@ ++Requires: glu |