view src/ftgl-1-gl-m4.patch @ 2661:3567da505594

json-c update to version 0.10, using github downloads. Squashed commit of the following: commit a93e1e80e4a6b668009bd024923e387f71eff7a3 Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 23:16:59 2012 +0200 Patches for: - missing file - remove check for rpl_* functions commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 19:08:40 2012 +0200 Fixed indentation commit 78b51e08e5174454495b8df547c4bccdc06bef73 Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 01:13:08 2012 +0200 json-c compiles correctly (finally). commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab Author: Thomas Mayer <thomas@residuum.org> Date: Fri Jul 13 22:16:41 2012 +0200 Changes to json-c files according to current MXE standards. commit a533fe5439d56de76c2d3b9d634c597cba94ff52 Author: Thomas Mayer <thomas@residuum.org> Date: Thu Jul 12 22:27:54 2012 +0200 Update to json-c 0.10, and use github repository.
author Thomas Mayer <thomas@residuum.org>
date Tue, 17 Jul 2012 23:18:18 +0200
parents 3a42978c7bc6
children
line wrap: on
line source

--- ftgl-2.1.3~rc5/m4/gl.m4	2008-05-05 16:48:57.000000000 +0200
+++ ftgl-2.1.3~rc5/m4/gl.m4.new	2010-09-20 14:55:27.000000000 +0200
@@ -63,6 +63,8 @@
     LIBS="-lGL"
 fi
 AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no])
+HAVE_GL=yes
+LIBS="-lopengl32"
 if test "x$HAVE_GL" = xno ; then
     if test "x$GL_X_LIBS" != x ; then
         LIBS="-lGL $GL_X_LIBS"
@@ -105,6 +107,8 @@
 AC_MSG_CHECKING([for GLU library])
 LIBS="-lGLU $GL_LIBS"
 AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
+LIBS="-lglu32 $GL_LIBS"
+HAVE_GLU=yes
 if test "x$HAVE_GLU" = xno ; then
     if test "x$GL_X_LIBS" != x ; then
         LIBS="-lGLU $GL_LIBS $GL_X_LIBS"