[Scummvm-cvs-logs] SF.net SVN: scummvm:[44402] scummvm/trunk

[dhewg at users.sourceforge.net]

Revision: 44402
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44402&view=rev
Author:   dhewg
Date:     2009-09-27 15:06:35 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
Use _port_mk for the Wii and Gamecube port.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wii/wii.mk
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/platform/wii/wii.mk
===================================================================
--- scummvm/trunk/backends/platform/wii/wii.mk	2009-09-27 14:59:40 UTC (rev 44401)
+++ scummvm/trunk/backends/platform/wii/wii.mk	2009-09-27 15:06:35 UTC (rev 44402)
@@ -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 @@
 	$(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

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-09-27 14:59:40 UTC (rev 44401)
+++ scummvm/trunk/configure	2009-09-27 15:06:35 UTC (rev 44402)
@@ -1487,8 +1487,8 @@
 			_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 @@
 			_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 */"


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