diff --git a/build/lol-build b/build/lol-build index 15223eef..5d5e93ea 100755 --- a/build/lol-build +++ b/build/lol-build @@ -101,6 +101,7 @@ configure() # If using mingw32, we're not really cross-compiling BUILDFLAGS= 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/sdl-1.2.14/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-image-1.2.10/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/gtk-2.0/include" CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/glib-2.0" diff --git a/configure.ac b/configure.ac index c24bd345..6e9cd1bd 100644 --- a/configure.ac +++ b/configure.ac @@ -147,12 +147,12 @@ PKG_CHECK_MODULES(GLEW, glew, GL_CFLAGS="${GLEW_CFLAGS} ${GL_CFLAGS}" GL_LIBS="${GLEW_LIBS} ${GL_LIBS}"], [:]) -AC_CHECK_HEADER(GL/glew.h, +AC_CHECK_HEADER(glew.h, [LIBS_save="${LIBS}" LIBS="${LIBS} -lglew32 ${GL_LIBS}" AC_MSG_CHECKING(for glewInit in -lglew32) AC_TRY_LINK( - [#include ], + [#include ], [glewInit();], [ac_cv_my_have_glew="yes" GL_LIBS="-lglew32 ${GL_LIBS}" diff --git a/src/lolgl.h b/src/lolgl.h index f66181b5..8902ae62 100644 --- a/src/lolgl.h +++ b/src/lolgl.h @@ -25,7 +25,7 @@ /* Include GL */ #if defined USE_GLEW -# include +# include #elif defined HAVE_GL_2X # if defined __APPLE__ && defined __MACH__ # include diff --git a/win32/Contribs.props b/win32/Contribs.props index 5c2687e1..1fca68a1 100644 --- a/win32/Contribs.props +++ b/win32/Contribs.props @@ -9,7 +9,7 @@ $(ContribDir)\sdl-1.2.14 $(ContribDir)\sdl-image-1.2.10 $(ContribDir)\sdl-mixer-1.2.11 - $(GlewDir)\include + $(GlewDir)\include\GL $(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 $(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include $(GlewDir)\lib\i686-w64-mingw32