diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-08 12:51:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 12:51:28 (GMT) |
| commit | 7d381a4edfac61d6e0b3dd5ce11648620ff25c60 (patch) | |
| tree | 63cc627aa9a39e2bd2b3b4aefb6b5fc030c5248d | |
| parent | bcb2cb2b934aa3cec4859f69bc81d56994922527 (diff) | |
| parent | ec6dad7d58767d8d6326b57f9b5f5ee5a4bc9748 (diff) | |
| download | mxe-7d381a4edfac61d6e0b3dd5ce11648620ff25c60.zip mxe-7d381a4edfac61d6e0b3dd5ce11648620ff25c60.tar.gz mxe-7d381a4edfac61d6e0b3dd5ce11648620ff25c60.tar.bz2 | |
Merge pull request #1429 from sibuserv/fix-freeglut
freeglut: update patch: fix pkgconfig file
| -rw-r--r-- | src/freeglut-1-fixes.patch | 27 | ||||
| -rw-r--r-- | src/freeglut.mk | 3 |
2 files changed, 23 insertions, 7 deletions
diff --git a/src/freeglut-1-fixes.patch b/src/freeglut-1-fixes.patch index 985078a..de0f0c0 100644 --- a/src/freeglut-1-fixes.patch +++ b/src/freeglut-1-fixes.patch @@ -22,19 +22,18 @@ index 1111111..2222222 100644 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) -@@ -53,9 +53,9 @@ ENDIF() +@@ -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) -+#IF(NOT WIN32) - OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON) +- OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON) -ENDIF() -+#ENDIF() ++OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON) SET(FREEGLUT_HEADERS -@@ -346,12 +346,18 @@ ENDIF() +@@ -346,12 +344,18 @@ ENDIF() IF(WIN32) @@ -55,3 +54,21 @@ index 1111111..2222222 100644 # 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}) diff --git a/src/freeglut.mk b/src/freeglut.mk index a22ca0a..e7dc69b 100644 --- a/src/freeglut.mk +++ b/src/freeglut.mk @@ -30,6 +30,5 @@ define $(PKG)_BUILD '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \ - $(if $(BUILD_STATIC),-DFREEGLUT_STATIC) \ - -L'$(PREFIX)/$(TARGET)/lib' -lglut -lglu32 -lopengl32 -lgdi32 -lwinmm + `'$(TARGET)-pkg-config' glut --cflags --libs` endef |