Changeset 954


Ignore:
Timestamp:
Sep 14, 2011, 8:54:06 PM (8 years ago)
Author:
sam
Message:

build: fix GLEW usage to use <glew.h>, not <GL/glew.h>.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r953 r954  
    102102                BUILDFLAGS=
    103103            fi
     104            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/x86_64-w64-mingw32/pkgconfig"
    104105            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"
    105106            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32"
     
    123124            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
    124125            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include"
    125             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/glew-1.7.0/include -DGLEW_STATIC"
     126            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/glew-1.7.0/include/GL -DGLEW_STATIC"
    126127            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/glib-2.0/include"
    127128            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/lib/gtk-2.0/include"
  • trunk/configure.ac

    r950 r954  
    148148  GL_LIBS="${GLEW_LIBS} ${GL_LIBS}"],
    149149 [:])
    150 AC_CHECK_HEADER(GL/glew.h,
     150AC_CHECK_HEADER(glew.h,
    151151 [LIBS_save="${LIBS}"
    152152  LIBS="${LIBS} -lglew32 ${GL_LIBS}"
    153153  AC_MSG_CHECKING(for glewInit in -lglew32)
    154154  AC_TRY_LINK(
    155    [#include <GL/glew.h>],
     155   [#include <glew.h>],
    156156   [glewInit();],
    157157   [ac_cv_my_have_glew="yes"
  • trunk/src/lolgl.h

    r796 r954  
    2626/* Include GL */
    2727#if defined USE_GLEW
    28 #   include <GL/glew.h>
     28#   include <glew.h>
    2929#elif defined HAVE_GL_2X
    3030#   if defined __APPLE__ && defined __MACH__
  • trunk/win32/Contribs.props

    r944 r954  
    1010    <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
    1111    <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
    12     <GlIncludes>$(GlewDir)\include</GlIncludes>
     12    <GlIncludes>$(GlewDir)\include\GL</GlIncludes>
    1313    <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>
    1414    <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
Note: See TracChangeset for help on using the changeset viewer.