[Scummvm-cvs-logs] SF.net SVN: scummvm:[51551] scummvm/branches/gsoc2010-opengl

vgvgf at users.sourceforge.net vgvgf at users.sourceforge.net
Sat Jul 31 21:57:54 CEST 2010


Revision: 51551
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51551&view=rev
Author:   vgvgf
Date:     2010-07-31 19:57:54 +0000 (Sat, 31 Jul 2010)

Log Message:
-----------
Add OpenGL dependencies to MinGW configure.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/gltexture.cpp
    scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp
    scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp
    scummvm/branches/gsoc2010-opengl/configure

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/gltexture.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/gltexture.cpp	2010-07-31 19:35:53 UTC (rev 51550)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/gltexture.cpp	2010-07-31 19:57:54 UTC (rev 51551)
@@ -23,7 +23,7 @@
  *
  */
 
-#ifdef USE_OPENGL
+#if defined(USE_OPENGL)
 
 #include "backends/graphics/opengl/gltexture.h"
 #include "backends/graphics/opengl/glerrorcheck.h"

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp	2010-07-31 19:35:53 UTC (rev 51550)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp	2010-07-31 19:57:54 UTC (rev 51551)
@@ -23,7 +23,7 @@
  *
  */
 
-#ifdef USE_OPENGL
+#if defined(USE_OPENGL)
 
 #include "backends/graphics/opengl/opengl-graphics.h"
 #include "backends/graphics/opengl/glerrorcheck.h"

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-07-31 19:35:53 UTC (rev 51550)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-07-31 19:57:54 UTC (rev 51551)
@@ -23,7 +23,7 @@
  *
  */
 
-#ifdef USE_OPENGL
+#if defined(USE_OPENGL)
 
 #include "backends/graphics/openglsdl/openglsdl-graphics.h"
 #include "backends/platform/sdl/sdl.h"

Modified: scummvm/branches/gsoc2010-opengl/configure
===================================================================
--- scummvm/branches/gsoc2010-opengl/configure	2010-07-31 19:35:53 UTC (rev 51550)
+++ scummvm/branches/gsoc2010-opengl/configure	2010-07-31 19:57:54 UTC (rev 51551)
@@ -1428,6 +1428,9 @@
 		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 @@
 		;;
 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list