[Scummvm-cvs-logs] scummvm master -> 86c656a75ba7a6766d1886fb723f8727de4e68a7

lordhoto lordhoto at gmail.com
Thu Jul 4 01:29:12 CEST 2013


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
83f7055836 CONFIGURE: Remove POSIXisms in configure.
86c656a75b SDL: Fix compilation on Solaris 10.


Commit: 83f705583681c6157e8ba33d9dd542f434dcb94b
    https://github.com/scummvm/scummvm/commit/83f705583681c6157e8ba33d9dd542f434dcb94b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-07-03T16:20:13-07:00

Commit Message:
CONFIGURE: Remove POSIXisms in configure.

This allows configure to work fine on Solaris 10 again. This fixes bug
 #3614513 "A few posixisms have crept into configure (w/ patch)".

Thanks to lblume for his patch.

Changed paths:
    configure



diff --git a/configure b/configure
index dbd78d3..91118bd 100755
--- a/configure
+++ b/configure
@@ -2176,7 +2176,7 @@ case $_host_os in
 		# When not cross-compiling, enable large file support, but don't
 		# care if getconf doesn't exist or doesn't recognize LFS_CFLAGS.
 		if test -z "$_host"; then
-			CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
+			CXXFLAGS="$CXXFLAGS `getconf LFS_CFLAGS 2>/dev/null`"
 		fi
 		;;
 	maemo)
@@ -3563,8 +3563,8 @@ if test "$_libunity" = auto ; then
 			;;
 		*)
 			# Unity has a lots of dependencies, update the libs and cflags var with them
-			LIBUNITY_LIBS="$LIBUNITY_LIBS $(pkg-config --libs unity = 3.8.4 2>> "$TMPLOG")"
-			LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS $(pkg-config --cflags unity = 3.8.4 2>> "$TMPLOG")"
+			LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs unity = 3.8.4 2>> "$TMPLOG"`"
+			LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags unity = 3.8.4 2>> "$TMPLOG"`"
 			_libunity=no
 			cat > $TMPC << EOF
 #include <unity.h>


Commit: 86c656a75ba7a6766d1886fb723f8727de4e68a7
    https://github.com/scummvm/scummvm/commit/86c656a75ba7a6766d1886fb723f8727de4e68a7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-07-03T16:25:46-07:00

Commit Message:
SDL: Fix compilation on Solaris 10.

This replaces a dummy FILE definition before including the SDL headers with
simply using the toolchain's definition on Solaris. This is pretty harmless
because we only allow FILE to be used in the SDL headers by this.

Fixes bug #3614514 "#define FILE FAKE_FILE doesn't work on Solaris (w/ patch)".

Thanks to lblume for his patch!

Changed paths:
    backends/platform/sdl/sdl-sys.h



diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index ca3c586..eccf738 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -35,8 +35,11 @@
 // it with an alternate slightly less unfriendly override.
 #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_FILE)
 #undef FILE
+// Solaris has typedef __FILE FILE in several places already
+#if !defined(__sun)
 typedef struct { int FAKE; } FAKE_FILE;
 #define FILE FAKE_FILE
+#endif   // (__sun)
 #endif
 
 #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_strcasecmp)






More information about the Scummvm-git-logs mailing list