Ticket #9254: scummvm-devkitppc.patch

configure

@@ -213 +213 @@
         echo "$CXX $LDFLAGS $CXXFLAGS $TMPC -o $TMPO$HOSTEXEEXT $@" >> "$TMPLOG"
         rm -f "$TMPO$HOSTEXEEXT"
         ( $CXX $LDFLAGS $CXXFLAGS "$TMPC" -o "$TMPO$HOSTEXEEXT" "$@" ) >> "$TMPLOG" 2>&1
-        TMP="$?"
-        echo "return code: $TMP" >> "$TMPLOG"
+        RES="$?"
+        echo "return code: $RES" >> "$TMPLOG"
         echo >> "$TMPLOG"
-        return "$TMP"
+        return "$RES"
 }
 
 cc_check_clean() {
@@ -225 +225 @@
 
 cc_check() {
         cc_check_no_clean "$@"
-        TMP="$?"
+        RES="$?"
         cc_check_clean
-        return "$TMP"
+        return "$RES"
 }
 
 cc_check_define() {
@@ -1007 +1007 @@
 gamecube)
         _host_os=gamecube
         _host_cpu=ppc
-        _host_alias=powerpc-gekko
+        _host_alias=powerpc-eabi
         ;;
 gp2x)
         _host_os=gph-linux
@@ -1122 +1122 @@
 wii)
         _host_os=wii
         _host_cpu=ppc
-        _host_alias=powerpc-gekko
+        _host_alias=powerpc-eabi
         ;;
 wince)
         _host_os=wince
@@ -1368 +1368 @@
 fi
 echo $_global_constructors
 
+if test ! "x$(which $_host_alias-strings)" = "x"; then
+_strings=$_host_alias-strings
+else
+_strings=strings
+fi
+
 #
 # Check for endianness
 #
@@ -1382 +1388 @@
 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
 else
         _endian=little
@@ -1422 +1428 @@
 #
 echo_n "Type with 1 byte... "
 type_1_byte=`find_type_with_size 1`
-TMP="$?"
+RES="$?"
 echo "$type_1_byte"
-test $TMP -eq 0 || exit 1       # check exit code of subshell
+test $RES -eq 0 || exit 1       # check exit code of subshell
 
 echo_n "Type with 2 bytes... "
 type_2_byte=`find_type_with_size 2`
-TMP="$?"
+RES="$?"
 echo "$type_2_byte"
-test $TMP -eq 0 || exit 1       # check exit code of subshell
+test $RES -eq 0 || exit 1       # check exit code of subshell
 
 echo_n "Type with 4 bytes... "
 type_4_byte=`find_type_with_size 4`
-TMP="$?"
+RES="$?"
 echo "$type_4_byte"
-test $TMP -eq 0 || exit 1       # check exit code of subshell
+test $RES -eq 0 || exit 1       # check exit code of subshell
 
 #
 # Check whether we can use x86 asm routines

backends/platform/wii/main.cpp

@@ -221 +221 @@
         printf("shutdown\n");
 
         SYS_UnregisterResetFunc(&resetinfo);
-        fatUnmountDefault();
+        //fatUnmountDefault();
 
         if (res)
                 show_console(res);

backends/platform/wii/osystem_events.cpp

@@ -185 +185 @@
         _padAcceleration = 9 - ConfMan.getInt("wii_pad_acceleration");
 
 #ifdef USE_WII_KBD
-        _kbd_active = KEYBOARD_Init() >= 0;
+        _kbd_active = KEYBOARD_Init(NULL) >= 0;
 #endif
 }
 

backends/platform/wii/wii.mk

@@ -17 +17 @@
         $(DEVKITPPC)/bin/geckoupload $<
 
 wiigdb:
-        $(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(EXECUTABLE)
+        $(DEVKITPPC)/bin/powerpc-eabi-gdb -n $(EXECUTABLE)
 
 wiidebug:
-        $(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(EXECUTABLE) -x $(srcdir)/backends/platform/wii/gdb.txt
+        $(DEVKITPPC)/bin/powerpc-eabi-gdb -n $(EXECUTABLE) -x $(srcdir)/backends/platform/wii/gdb.txt
 
 # target to create a Wii snapshot
 wiidist: all