Merge pull request #1429 from sibuserv/fix-freeglut

freeglut: update patch: fix pkgconfig file

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})

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