aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heider2009-09-27 15:06:35 +0000
committerAndre Heider2009-09-27 15:06:35 +0000
commit0d2056f8c9e8b77d1a19a0a350b8b9cfa9e8fa76 (patch)
tree4f056174f467fde525801f0fbd1aeafccd16f726
parentac4c2701e9b59b551620dbea5f9bdc72fc46e2ab (diff)
downloadscummvm-rg350-0d2056f8c9e8b77d1a19a0a350b8b9cfa9e8fa76.tar.gz
scummvm-rg350-0d2056f8c9e8b77d1a19a0a350b8b9cfa9e8fa76.tar.bz2
scummvm-rg350-0d2056f8c9e8b77d1a19a0a350b8b9cfa9e8fa76.zip
Use _port_mk for the Wii and Gamecube port.
svn-id: r44402
-rw-r--r--backends/platform/wii/wii.mk11
-rwxr-xr-xconfigure4
2 files changed, 8 insertions, 7 deletions
diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index a6f66f7ea4..c92b9017b6 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -1,7 +1,8 @@
-WII_EXE := scummvm$(EXEEXT)
WII_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
-$(WII_EXE_STRIPPED): $(WII_EXE)
+all: $(WII_EXE_STRIPPED)
+
+$(WII_EXE_STRIPPED): $(EXECUTABLE)
$(STRIP) $< -o $@
clean: wiiclean
@@ -16,13 +17,13 @@ geckoupload: $(WII_EXE_STRIPPED)
$(DEVKITPPC)/bin/geckoupload $<
wiigdb:
- $(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_EXE)
+ $(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(EXECUTABLE)
wiidebug:
- $(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_EXE) -x $(srcdir)/backends/platform/wii/gdb.txt
+ $(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(EXECUTABLE) -x $(srcdir)/backends/platform/wii/gdb.txt
# target to create a Wii snapshot
-wiidist: $(EXECUTABLE)
+wiidist: all
$(MKDIR) wiidist/scummvm
ifeq ($(GAMECUBE),1)
$(DEVKITPPC)/bin/elf2dol $(EXECUTABLE) wiidist/scummvm/scummvm.dol
diff --git a/configure b/configure
index f842b75f1e..fd8b8feb59 100755
--- a/configure
+++ b/configure
@@ -1487,8 +1487,8 @@ if test -n "$_host"; then
_backend="wii"
_build_scalers="no"
_build_hq_scalers="no"
+ _port_mk="backends/platform/wii/wii.mk"
add_line_to_config_mk 'GAMECUBE = 0'
- add_line_to_config_mk 'include $(srcdir)/backends/platform/wii/wii.mk'
add_line_to_config_h "#define DEBUG_WII_USBGECKO"
add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */"
add_line_to_config_h "/* #define DEBUG_WII_GDB */"
@@ -1507,8 +1507,8 @@ if test -n "$_host"; then
_build_scalers="no"
_build_hq_scalers="no"
_mt32emu="no"
+ _port_mk="backends/platform/wii/wii.mk"
add_line_to_config_mk 'GAMECUBE = 1'
- add_line_to_config_mk 'include $(srcdir)/backends/platform/wii/wii.mk'
add_line_to_config_h '#define GAMECUBE'
add_line_to_config_h "/* #define DEBUG_WII_USBGECKO */"
add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */"