diff options
| -rw-r--r-- | Makefile.common | 6 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/win32.mk | 3 | ||||
| -rw-r--r-- | backends/platform/wince/wince.mk | 4 | ||||
| -rwxr-xr-x | configure | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common index f6707f710b..fc99ce1a30 100644 --- a/Makefile.common +++ b/Makefile.common @@ -156,6 +156,12 @@ endif $(QUIET)$(MKDIR) $(*D) $(QUIET_AS)$(AS) $(ASFLAGS) $(<) -o $*.o +# Build rule for Windows resource files +# TODO: Support dependency tracking +%.o: %.rc + $(QUIET)$(MKDIR) $(*D) + $(QUIET_WINDRES)$(WINDRES) $(WINDRESFLAGS) $(CPPFLAGS) $(<) -o $*.o + ifdef USE_NASM # Build rule for NASM assembler files %.o: %.asm diff --git a/backends/platform/sdl/win32/win32.mk b/backends/platform/sdl/win32/win32.mk index f878a9d755..887bae6c45 100644 --- a/backends/platform/sdl/win32/win32.mk +++ b/backends/platform/sdl/win32/win32.mk @@ -2,8 +2,7 @@ # Windows specific # -scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/scummvm.rc - $(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o +dists/scummvm.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) config.h $(srcdir)/base/internal_version.h # Special target to create a win32 snapshot binary (for Inno Setup) win32dist: all diff --git a/backends/platform/wince/wince.mk b/backends/platform/wince/wince.mk index c5f3274747..64768dcc8a 100644 --- a/backends/platform/wince/wince.mk +++ b/backends/platform/wince/wince.mk @@ -2,10 +2,6 @@ ifdef WRAP_MALLOC LDFLAGS += -Wl,--wrap,malloc -Wl,--wrap,free endif -backends/platform/wince/PocketSCUMM.o: $(srcdir)/backends/platform/wince/PocketSCUMM.rc - $(QUIET)$(MKDIR) $(*D) - $(WINDRES) $(WINDRESFLAGS) -I$(srcdir)/backends/platform/wince $< $@ - ifdef DYNAMIC_MODULES plugins: backends/platform/wince/stub.o backends/platform/wince/PocketSCUMM.o $(CXX) backends/platform/wince/stub.o backends/platform/wince/PocketSCUMM.o -L. -lscummvm -o scummvm.exe @@ -2786,7 +2786,7 @@ case $_host_os in append_var DEFINES "-D__USE_MINGW_ANSI_STDIO=0" append_var LDFLAGS "-static-libgcc -static-libstdc++" append_var LIBS "-lmingw32 -lwinmm -lgdi32" - append_var OBJS "scummvmwinres.o" + append_var OBJS "dists/scummvm.o" add_line_to_config_mk 'WIN32 = 1' _port_mk="backends/platform/sdl/win32/win32.mk" ;; |