@@ -101,6 +101,7 @@ configure() | |||||
# If using mingw32, we're not really cross-compiling | # If using mingw32, we're not really cross-compiling | ||||
BUILDFLAGS= | BUILDFLAGS= | ||||
fi | fi | ||||
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/x86_64-w64-mingw32/pkgconfig" | |||||
LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32" | LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32" | ||||
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32" | LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32" | ||||
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32" | LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32" | ||||
@@ -122,7 +123,7 @@ configure() | |||||
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include" | CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include" | ||||
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include" | CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include" | ||||
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include" | CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include" | ||||
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/glew-1.7.0/include -DGLEW_STATIC" | CPPFLAGS="$CPPFLAGS -I$PWD/contrib/glew-1.7.0/include/GL -DGLEW_STATIC" | ||||
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/glib-2.0/include" | CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/glib-2.0/include" | ||||
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/gtk-2.0/include" | CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/gtk-2.0/include" | ||||
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/glib-2.0" | CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/glib-2.0" | ||||
@@ -147,12 +147,12 @@ PKG_CHECK_MODULES(GLEW, glew, | |||||
GL_CFLAGS="${GLEW_CFLAGS} ${GL_CFLAGS}" | GL_CFLAGS="${GLEW_CFLAGS} ${GL_CFLAGS}" | ||||
GL_LIBS="${GLEW_LIBS} ${GL_LIBS}"], | GL_LIBS="${GLEW_LIBS} ${GL_LIBS}"], | ||||
[:]) | [:]) | ||||
AC_CHECK_HEADER(GL/glew.h, | AC_CHECK_HEADER(glew.h, | ||||
[LIBS_save="${LIBS}" | [LIBS_save="${LIBS}" | ||||
LIBS="${LIBS} -lglew32 ${GL_LIBS}" | LIBS="${LIBS} -lglew32 ${GL_LIBS}" | ||||
AC_MSG_CHECKING(for glewInit in -lglew32) | AC_MSG_CHECKING(for glewInit in -lglew32) | ||||
AC_TRY_LINK( | AC_TRY_LINK( | ||||
[#include <GL/glew.h>], | [#include <glew.h>], | ||||
[glewInit();], | [glewInit();], | ||||
[ac_cv_my_have_glew="yes" | [ac_cv_my_have_glew="yes" | ||||
GL_LIBS="-lglew32 ${GL_LIBS}" | GL_LIBS="-lglew32 ${GL_LIBS}" | ||||
@@ -25,7 +25,7 @@ | |||||
/* Include GL */ | /* Include GL */ | ||||
#if defined USE_GLEW | #if defined USE_GLEW | ||||
# include <GL/glew.h> | # include <glew.h> | ||||
#elif defined HAVE_GL_2X | #elif defined HAVE_GL_2X | ||||
# if defined __APPLE__ && defined __MACH__ | # if defined __APPLE__ && defined __MACH__ | ||||
# include <OpenGL/gl.h> | # include <OpenGL/gl.h> | ||||
@@ -9,7 +9,7 @@ | |||||
<SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir> | <SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir> | ||||
<SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir> | <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir> | ||||
<SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir> | <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir> | ||||
<GlIncludes>$(GlewDir)\include</GlIncludes> | <GlIncludes>$(GlewDir)\include\GL</GlIncludes> | ||||
<GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes> | <GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes> | ||||
<SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes> | <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes> | ||||
<GlLibs>$(GlewDir)\lib\i686-w64-mingw32</GlLibs> | <GlLibs>$(GlewDir)\lib\i686-w64-mingw32</GlLibs> | ||||