[Scummvm-cvs-logs] scummvm master -> ec931b26ecc6226de95cd10b5a1ae561ea0f5386
lordhoto
lordhoto at gmail.com
Thu May 22 01:59:16 CEST 2014
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
54c957913a CONFIGURE: Add support for host-alias prefixed strings binary.
e89b0fd439 CONFIGURE: Add support for host-alias prefixed strings binary on LE.
d0c3635244 CONFIGURE: Fix information output for host-alias-strings test.
2ff0a553c3 CONFIGURE: Send output for host-alias-strings test to config.log
ec931b26ec Merge pull request #463 from digitall/wiiMiscConfigure
Commit: 54c957913a0345709b04c2d78c73238ddfb7d1f1
https://github.com/scummvm/scummvm/commit/54c957913a0345709b04c2d78c73238ddfb7d1f1
Author: D G Turner (digitall at scummvm.org)
Date: 2014-05-17T23:28:00+01:00
Commit Message:
CONFIGURE: Add support for host-alias prefixed strings binary.
This is the last outstanding change of patch #1359 - "Update
wii/gamecube configure" submitted on 2010-11-15.
Changed paths:
configure
diff --git a/configure b/configure
index 4e4e9d1..122b1ed 100755
--- a/configure
+++ b/configure
@@ -1843,6 +1843,12 @@ if test "$_global_constructors" = yes; then
fi
echo $_global_constructors
+if test ! "x$(which $_host_alias-strings)" = "x"; then
+_strings=$_host_alias-strings
+else
+_strings=strings
+fi
+
#
# Check for endianness
#
@@ -1857,7 +1863,7 @@ void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }
int main() { _ascii (); _ebcdic (); return 0; }
EOF
$CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
-if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
+if $_strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
_endian=big
elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
_endian=little
Commit: e89b0fd4393be93e79095f87d6ce3a1ca2c8d849
https://github.com/scummvm/scummvm/commit/e89b0fd4393be93e79095f87d6ce3a1ca2c8d849
Author: D G Turner (digitall at scummvm.org)
Date: 2014-05-18T00:30:12+01:00
Commit Message:
CONFIGURE: Add support for host-alias prefixed strings binary on LE.
This was missed from the Wii patch as the Wii is Big Endian.
Changed paths:
configure
diff --git a/configure b/configure
index 122b1ed..4114034 100755
--- a/configure
+++ b/configure
@@ -1865,7 +1865,7 @@ EOF
$CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
if $_strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
_endian=big
-elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
+elif $_strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
_endian=little
fi
echo $_endian;
Commit: d0c363524451fbdeee7459ca544eb26f20b4d789
https://github.com/scummvm/scummvm/commit/d0c363524451fbdeee7459ca544eb26f20b4d789
Author: D G Turner (digitall at scummvm.org)
Date: 2014-05-20T19:29:55+01:00
Commit Message:
CONFIGURE: Fix information output for host-alias-strings test.
Thanks to LordHoto for the amendment to surpress error output.
Changed paths:
configure
diff --git a/configure b/configure
index 4114034..ee97e17 100755
--- a/configure
+++ b/configure
@@ -1843,10 +1843,13 @@ if test "$_global_constructors" = yes; then
fi
echo $_global_constructors
-if test ! "x$(which $_host_alias-strings)" = "x"; then
+echo_n "Checking for $_host_alias-strings... "
+if test ! "x$(which $_host_alias-strings 2>/dev/null)" = "x"; then
_strings=$_host_alias-strings
+echo yes
else
_strings=strings
+echo no
fi
#
Commit: 2ff0a553c303569412030a55d61802f7006727f1
https://github.com/scummvm/scummvm/commit/2ff0a553c303569412030a55d61802f7006727f1
Author: D G Turner (digitall at scummvm.org)
Date: 2014-05-21T22:26:22+01:00
Commit Message:
CONFIGURE: Send output for host-alias-strings test to config.log
This is not critical to build configuration and any problems would
be visible by an incorrect endian test result.
Changed paths:
configure
diff --git a/configure b/configure
index ee97e17..c2020ab 100755
--- a/configure
+++ b/configure
@@ -1843,13 +1843,13 @@ if test "$_global_constructors" = yes; then
fi
echo $_global_constructors
-echo_n "Checking for $_host_alias-strings... "
+echo_n "Checking for $_host_alias-strings... " >> "$TMPLOG"
if test ! "x$(which $_host_alias-strings 2>/dev/null)" = "x"; then
_strings=$_host_alias-strings
-echo yes
+echo yes >> "$TMPLOG"
else
_strings=strings
-echo no
+echo no >> "$TMPLOG"
fi
#
Commit: ec931b26ecc6226de95cd10b5a1ae561ea0f5386
https://github.com/scummvm/scummvm/commit/ec931b26ecc6226de95cd10b5a1ae561ea0f5386
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-05-22T01:58:47+02:00
Commit Message:
Merge pull request #463 from digitall/wiiMiscConfigure
CONFIGURE: Add support for host-alias prefixed strings binary.
Changed paths:
configure
More information about the Scummvm-git-logs
mailing list