diff options
| author | Alejandro Marzini | 2010-07-31 19:57:54 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-31 19:57:54 +0000 |
| commit | 6d6756b46ad68294e93438f18f082e346ff775f9 (patch) | |
| tree | d4657a50ffcc720c5f3d43f37f7d6d90963e2824 | |
| parent | fc94a3246a7ba26bf49205941a65e3acc3adb800 (diff) | |
| download | scummvm-rg350-6d6756b46ad68294e93438f18f082e346ff775f9.tar.gz scummvm-rg350-6d6756b46ad68294e93438f18f082e346ff775f9.tar.bz2 scummvm-rg350-6d6756b46ad68294e93438f18f082e346ff775f9.zip | |
Add OpenGL dependencies to MinGW configure.
svn-id: r51551
| -rw-r--r-- | backends/graphics/opengl/gltexture.cpp | 2 | ||||
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.cpp | 2 | ||||
| -rw-r--r-- | backends/graphics/openglsdl/openglsdl-graphics.cpp | 2 | ||||
| -rwxr-xr-x | configure | 21 |
4 files changed, 17 insertions, 10 deletions
diff --git a/backends/graphics/opengl/gltexture.cpp b/backends/graphics/opengl/gltexture.cpp index 7514fd0662..79e7cd48f0 100644 --- a/backends/graphics/opengl/gltexture.cpp +++ b/backends/graphics/opengl/gltexture.cpp @@ -23,7 +23,7 @@ * */ -#ifdef USE_OPENGL +#if defined(USE_OPENGL) #include "backends/graphics/opengl/gltexture.h" #include "backends/graphics/opengl/glerrorcheck.h" diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp index f1436170b8..7c47d5b967 100644 --- a/backends/graphics/opengl/opengl-graphics.cpp +++ b/backends/graphics/opengl/opengl-graphics.cpp @@ -23,7 +23,7 @@ * */ -#ifdef USE_OPENGL +#if defined(USE_OPENGL) #include "backends/graphics/opengl/opengl-graphics.h" #include "backends/graphics/opengl/glerrorcheck.h" diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp index 4dac109a01..c4eddbb8ad 100644 --- a/backends/graphics/openglsdl/openglsdl-graphics.cpp +++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp @@ -23,7 +23,7 @@ * */ -#ifdef USE_OPENGL +#if defined(USE_OPENGL) #include "backends/graphics/openglsdl/openglsdl-graphics.h" #include "backends/platform/sdl/sdl.h" @@ -1428,6 +1428,9 @@ case $_host_os in DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0" LIBS="$LIBS -lmingw32 -lwinmm" OBJS="$OBJS scummvmico.o" + OPENGL_CFLAGS="" + OPENGL_LIBS="-lopengl32" + add_line_to_config_mk 'WIN32 = 1' ;; mint*) DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE" @@ -1484,13 +1487,17 @@ case $_host_os in ;; esac -# HACK: On non-OSX systems, add the GL library -case $_host_os in - *darwin*) - ;; - *) - OPENGL_LIBS="$OPENGL_LIBS -lGL" -esac +# HACK: On non-OSX systems and no mingw compiler, add the GL library if using sdl backend +if test "$_backend" = "sdl" ; then + case $_host_os in + *darwin*) + ;; + *mingw*) + ;; + *) + OPENGL_LIBS="$OPENGL_LIBS -lGL" + esac +fi if test -n "$_host"; then # Cross-compiling mode - add your target here if needed |