[Scummvm-cvs-logs] SF.net SVN: scummvm:[46731] tools/trunk/configure

[Kirben at users.sourceforge.net]

Revision: 46731
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46731&view=rev
Author:   Kirben
Date:     2009-12-29 23:59:44 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Fix mingw compile, when using static libpng.

Modified Paths:
--------------
    tools/trunk/configure

Modified: tools/trunk/configure
===================================================================
--- tools/trunk/configure	2009-12-29 23:25:24 UTC (rev 46730)
+++ tools/trunk/configure	2009-12-29 23:59:44 UTC (rev 46731)
@@ -685,8 +685,7 @@
 		;;
 	mingw*)
 		DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0"
-		LIBS="$LIBS -lmingw32 -lwinmm"
-		OBJS="$OBJS scummvmico.o"
+		LIBS="$LIBS -lmingw32"
 		;;
 	cygwin*)
 		echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
@@ -897,29 +896,6 @@
 echo "$_mad"
 
 #
-# Check for ZLib
-#
-echocheck "zlib"
-if test "$_zlib" = auto ; then
-	_zlib=no
-	cat > $TMPC << EOF
-#include <string.h>
-#include <zlib.h>
-int main(void) { return strcmp(ZLIB_VERSION, zlibVersion()); }
-EOF
-	cc_check $LDFLAGS $CXXFLAGS $ZLIB_CFLAGS $ZLIB_LIBS -lz && _zlib=yes
-fi
-if test "$_zlib" = yes ; then
-	_def_zlib='#define USE_ZLIB'
-	LIBS="$LIBS $ZLIB_LIBS -lz"
-	INCLUDES="$INCLUDES $ZLIB_CFLAGS"
-else
-	_def_zlib='#undef USE_ZLIB'
-fi
-add_to_config_mk_if_yes "$_zlib" 'USE_ZLIB = 1'
-echo "$_zlib"
-
-#
 # Check for PNG
 #
 echocheck "png"
@@ -948,6 +924,29 @@
 echo "$_png"
 
 #
+# Check for ZLib
+#
+echocheck "zlib"
+if test "$_zlib" = auto ; then
+	_zlib=no
+	cat > $TMPC << EOF
+#include <string.h>
+#include <zlib.h>
+int main(void) { return strcmp(ZLIB_VERSION, zlibVersion()); }
+EOF
+	cc_check $LDFLAGS $CXXFLAGS $ZLIB_CFLAGS $ZLIB_LIBS -lz && _zlib=yes
+fi
+if test "$_zlib" = yes ; then
+	_def_zlib='#define USE_ZLIB'
+	LIBS="$LIBS $ZLIB_LIBS -lz"
+	INCLUDES="$INCLUDES $ZLIB_CFLAGS"
+else
+	_def_zlib='#undef USE_ZLIB'
+fi
+add_to_config_mk_if_yes "$_zlib" 'USE_ZLIB = 1'
+echo "$_zlib"
+
+#
 # Check for FreeType
 #
 echocheck "freetype"


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