Changeset 801
- Timestamp:
- Aug 2, 2011, 6:09:23 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build-mingw
r797 r801 15 15 16 16 # Glew include path 17 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/glew-1.6.0/include "17 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/glew-1.6.0/include -DGLEW_STATIC" 18 18 19 19 # GTK include path … … 48 48 49 49 # Help our build scripts a bit here 50 GTK_LIBS="$GTK_LIBS -lgtkgl-2.0 -lopengl32 -lg di32"50 GTK_LIBS="$GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32" 51 51 GTK_LIBS="$GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0" 52 52 GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0" -
trunk/configure.ac
r797 r801 82 82 [ac_cv_my_have_gl="yes" 83 83 AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available) 84 GL_CFLAGS="${GL ES2_CFLAGS}"85 GL_LIBS="${GL ES2_LIBS}"],84 GL_CFLAGS="${GL_CFLAGS} ${GLES2_CFLAGS}" 85 GL_LIBS="${GL_LIBS} ${GLES2_LIBS}"], 86 86 [:]) 87 87 AC_CHECK_LIB(GL, glLoadIdentity, … … 107 107 dnl Use Glew? 108 108 ac_cv_my_have_glew="no" 109 PKG_CHECK_MODULES(GLEW, glew, [ac_cv_my_have_glew="yes"], [:]) 109 PKG_CHECK_MODULES(GLEW, glew, 110 [ac_cv_my_have_glew="yes" 111 GL_CFLAGS="${GLEW_CFLAGS} ${GL_CFLAGS}" 112 GL_LIBS="${GLEW_LIBS} ${GL_LIBS}"], 113 [:]) 110 114 AC_CHECK_HEADER(GL/glew.h, 111 [LIBS_save="$ LIBS"112 LIBS="$ LIBS -lglew32"115 [LIBS_save="${LIBS}" 116 LIBS="${LIBS} -lglew32 ${GL_LIBS}" 113 117 AC_MSG_CHECKING(for glewInit in -lglew32) 114 AC_TRY_LINK([#include <GL/glew.h>], 118 AC_TRY_LINK( 119 [#include <GL/glew.h>], 115 120 [glewInit();], 116 121 [ac_cv_my_have_glew="yes" 117 122 AC_MSG_RESULT(yes)], 118 123 [AC_MSG_RESULT(no)]) 119 LIBS="$LIBS_save"]) 124 GL_LIBS="-lglew32 ${GL_LIBS}" 125 LIBS="${LIBS_save}"]) 120 126 if test "${ac_cv_my_have_glew}" != "no"; then 121 127 AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available) … … 124 130 AM_CONDITIONAL(USE_GLEW, test "${ac_cv_my_have_glew}" != "no") 125 131 126 dnl Poor man's GL feature detection .132 dnl Poor man's GL feature detection if all else failed. 127 133 save_LIBS="${LIBS}" 128 134 LIBS="${LIBS} ${GL_LIBS} ${GLES2_LIBS}" … … 215 221 dnl How to use the Lol Engine inside this tree 216 222 LOL_CFLAGS="$LOL_CFLAGS -I \$(top_srcdir)/src" 217 LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $EGL_CFLAGS $ GLEW_CFLAGS $LIBPNG_CFLAGS"218 LOL_LIBS="$LOL_LIBS $SDL_LIBS $EGL_LIBS $ GLEW_LIBS $LIBPNG_LIBS"223 LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS" 224 LOL_LIBS="$LOL_LIBS $SDL_LIBS $EGL_LIBS $LIBPNG_LIBS" 219 225 220 226 AC_SUBST(MATH_LIBS)
Note: See TracChangeset
for help on using the changeset viewer.