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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Oct 5 01:21:04 CEST 2009


Revision: 44647
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44647&view=rev
Author:   fingolfin
Date:     2009-10-04 23:21:01 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
Revert nonsense I did in backends/platform/linuxmoto/module.mk and modify ASM build rules instead, enforcing the creation of output dirs for compiled files

Modified Paths:
--------------
    scummvm/trunk/Makefile.common
    scummvm/trunk/backends/platform/linuxmoto/module.mk

Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common	2009-10-04 22:59:39 UTC (rev 44646)
+++ scummvm/trunk/Makefile.common	2009-10-04 23:21:01 UTC (rev 44647)
@@ -118,10 +118,12 @@
 
 
 %.o: %.s
+	$(QUIET)$(MKDIR) $(*D)
 	$(QUIET_AS)$(AS) $(ASFLAGS) $(<) -o $*.o
 
 ifdef HAVE_NASM
 %.o: %.asm
+	$(QUIET)$(MKDIR) $(*D)
 	$(QUIET_NASM)$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
 endif
 

Modified: scummvm/trunk/backends/platform/linuxmoto/module.mk
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/module.mk	2009-10-04 22:59:39 UTC (rev 44646)
+++ scummvm/trunk/backends/platform/linuxmoto/module.mk	2009-10-04 23:21:01 UTC (rev 44647)
@@ -6,7 +6,8 @@
 	linuxmoto-sdl.o \
 	linuxmoto-scaler.o \
 	linuxmoto-graphics.o \
-	hardwarekeys.o
+	hardwarekeys.o \
+	../wince/ARMscaler.o
 
 MODULE_DIRS += \
 	backends/platform/linuxmoto/
@@ -14,10 +15,5 @@
 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
 
-# HACK: We import one of the WinCE scalers
-OBJS += backends/platform/wince/ARMscaler.o
-MODULE_DIRS += \
-	backends/platform/wii/
-
 # HACK: The linuxmoto backend is based on the SDL one, so we load that, too.
 include $(srcdir)/backends/platform/sdl/module.mk


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




More information about the Scummvm-git-logs mailing list