diff options
| author | Max Horn | 2009-10-04 23:21:01 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-04 23:21:01 +0000 |
| commit | 126450f3bc272570d19d0dc8a7473287d1b72ff0 (patch) | |
| tree | 82198d51e021679508977e189bbe4ce01fc1b620 | |
| parent | fd5cf8f2dbe7e0a64b1f1e387a6c7aa393207698 (diff) | |
| download | scummvm-rg350-126450f3bc272570d19d0dc8a7473287d1b72ff0.tar.gz scummvm-rg350-126450f3bc272570d19d0dc8a7473287d1b72ff0.tar.bz2 scummvm-rg350-126450f3bc272570d19d0dc8a7473287d1b72ff0.zip | |
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
svn-id: r44647
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | backends/platform/linuxmoto/module.mk | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common index 790dca8f89..5b57446e11 100644 --- a/Makefile.common +++ b/Makefile.common @@ -118,10 +118,12 @@ endif %.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 diff --git a/backends/platform/linuxmoto/module.mk b/backends/platform/linuxmoto/module.mk index 034c10c09a..967a55f249 100644 --- a/backends/platform/linuxmoto/module.mk +++ b/backends/platform/linuxmoto/module.mk @@ -6,7 +6,8 @@ MODULE_OBJS := \ 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 @@ MODULE_DIRS += \ # 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 |