Changeset 797


Ignore:
Timestamp:
Aug 2, 2011, 6:08:52 PM (8 years ago)
Author:
sam
Message:

build: make build-mingw properly use the contrib libglew.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build-mingw

    r625 r797  
    1313CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-image-1.2.10/include"
    1414CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-mixer-1.2.11/include"
     15
     16# Glew include path
     17CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/glew-1.6.0/include"
    1518
    1619# GTK include path
     
    3033LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-mixer-1.2.11/lib"
    3134
     35# Glew library path
     36LDFLAGS="$LDFLAGS -L`pwd`/contrib/glew-1.6.0/lib"
     37
    3238# GTK library path
    3339LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/lib"
     
    4652GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"
    4753
    48 LOL_LIBS="$LOL_LIBS -lSDL_image -lSDL_mixer -lSDLmain -lSDL -lopengl32"
     54LOL_LIBS="$LOL_LIBS -lSDL_image -lSDL_mixer -lSDLmain -lSDL -lopengl32 -lglew32"
    4955
    5056# Bootstrap, configure and make
  • trunk/configure.ac

    r796 r797  
    9797   [ac_cv_my_have_gl="yes"
    9898    AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available) # FIXME: hacky
    99     AC_MSG_RESULT("yes")
     99    AC_MSG_RESULT(yes)
    100100    GL_LIBS="-lopengl32"],
    101    [AC_MSG_RESULT("no")])
     101   [AC_MSG_RESULT(no)])
    102102  LIBS="$LIBS_save"])
    103103if test "${ac_cv_my_have_gl}" = "no"; then
     
    108108ac_cv_my_have_glew="no"
    109109PKG_CHECK_MODULES(GLEW, glew, [ac_cv_my_have_glew="yes"], [:])
     110AC_CHECK_HEADER(GL/glew.h,
     111 [LIBS_save="$LIBS"
     112  LIBS="$LIBS -lglew32"
     113  AC_MSG_CHECKING(for glewInit in -lglew32)
     114  AC_TRY_LINK([#include <GL/glew.h>],
     115   [glewInit();],
     116   [ac_cv_my_have_glew="yes"
     117    AC_MSG_RESULT(yes)],
     118   [AC_MSG_RESULT(no)])
     119  LIBS="$LIBS_save"])
    110120if test "${ac_cv_my_have_glew}" != "no"; then
    111121  AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available)
Note: See TracChangeset for help on using the changeset viewer.