diff --git a/Makefile.common b/Makefile.common index a88becfa778..3e2d47e006b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -123,7 +123,7 @@ endif # The build rule for the ScummVM executable $(EXECUTABLE): $(DETECT_OBJS) $(OBJS) - $(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@ + +$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@ ifdef SPLIT_DWARF $(EXECUTABLE).dwp: $(EXECUTABLE) diff --git a/backends/platform/ds/arm7/Makefile b/backends/platform/ds/arm7/Makefile index 3289266df9b..2c75019aedb 100644 --- a/backends/platform/ds/arm7/Makefile +++ b/backends/platform/ds/arm7/Makefile @@ -156,7 +156,7 @@ $(OUTPUT).elf : $(OFILES) #--------------------------------------------------------------------------------- %.elf: echo ELF - $(LD) $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf + +$(LD) $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk index 855cef72fae..16cffeabde7 100644 --- a/backends/platform/ds/ds.mk +++ b/backends/platform/ds/ds.mk @@ -207,7 +207,7 @@ $(ndsdir)/arm7/source/main.o: CPPFLAGS= $(ndsdir)/arm7/arm7.elf: \ $(ndsdir)/arm7/source/libcartreset/cartreset.o \ $(ndsdir)/arm7/source/main.o - $(LD) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7 -o $@ + +$(LD) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7 -o $@ diff --git a/backends/platform/n64/Makefile b/backends/platform/n64/Makefile index 4f3744f7e85..f7341eedd46 100644 --- a/backends/platform/n64/Makefile +++ b/backends/platform/n64/Makefile @@ -80,7 +80,7 @@ ROMFS.img: genromfs -f ./ROMFS.img -d ./ROMFS -V romtest $(TARGET).elf: $(OBJS) - $(LD) -o $(TARGET).elf $(OBJS) $(LDFLAGS) + +$(LD) -o $(TARGET).elf $(OBJS) $(LDFLAGS) $(TARGET).bin : $(TARGET).elf $(OBJCOPY) $(TARGET).elf $(TARGET).bin -O binary diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile index 7f4f20446ea..d11c2be38a7 100644 --- a/backends/platform/psp/Makefile +++ b/backends/platform/psp/Makefile @@ -173,7 +173,7 @@ LDFLAGS += -Wl,-T../../plugins/psp/main_prog.ld all: $(PSP_EBOOT) $(TARGET).elf: $(OBJS) - $(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) $(LIBS) -o $@ + +$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) $(LIBS) -o $@ cp $(TARGET).elf $(TARGET).org.elf $(FIXUP) $@ diff --git a/devtools/module.mk b/devtools/module.mk index eea319881ac..d5c7d65400d 100644 --- a/devtools/module.mk +++ b/devtools/module.mk @@ -34,15 +34,15 @@ clean-devtools: devtools/convbdf$(EXEEXT): $(srcdir)/devtools/convbdf.cpp $(QUIET)$(MKDIR) devtools/$(DEPDIR) - $(QUIET_LINK)$(LD) $(CXXFLAGS) -Wall -o $@ $< + +$(QUIET_LINK)$(LD) $(CXXFLAGS) -Wall -o $@ $< devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.c $(QUIET)$(MKDIR) devtools/$(DEPDIR) - $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< + +$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c $(QUIET)$(MKDIR) devtools/$(DEPDIR) - $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< + +$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< # Rule to explicitly rebuild the wwwroot archive wwwroot: diff --git a/ports.mk b/ports.mk index 38e58ada244..8be0d435cf8 100644 --- a/ports.mk +++ b/ports.mk @@ -470,14 +470,14 @@ endif # We use -force_cpusubtype_ALL to ensure the binary runs on every # PowerPC machine. scummvm-static: $(DETECT_OBJS) $(OBJS) - $(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \ + +$(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \ -framework CoreMIDI \ $(OSX_STATIC_LIBS) \ $(OSX_ZLIB) # Special target to create a static linked binary for the iPhone (legacy, and iOS 7+) iphone: $(DETECT_OBJS) $(OBJS) - $(LD) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \ + +$(LD) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \ $(OSX_STATIC_LIBS) \ -framework UIKit -framework CoreGraphics -framework OpenGLES \ -framework CoreFoundation -framework QuartzCore -framework Foundation \ diff --git a/rules.mk b/rules.mk index bb27b3322ef..88819554fe4 100644 --- a/rules.mk +++ b/rules.mk @@ -25,7 +25,7 @@ TOOL_LIBS-$(TOOL-$(MODULE)) := $(TOOL_LIBS) TOOL_CFLAGS-$(TOOL-$(MODULE)) := $(TOOL_CFLAGS) $(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS) - $(QUIET_LINK)$(LD) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@ + +$(QUIET_LINK)$(LD) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@ # Reset TOOL_* vars TOOL_EXECUTABLE:= @@ -48,7 +48,7 @@ ifdef PLUGIN PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX) $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS) $(QUIET)$(MKDIR) plugins - $(QUIET_PLUGIN)$(LD) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@ + +$(QUIET_PLUGIN)$(LD) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@ # Reset PLUGIN var PLUGIN:= diff --git a/test/module.mk b/test/module.mk index 5b34568e32d..192e336dbc6 100644 --- a/test/module.mk +++ b/test/module.mk @@ -71,7 +71,7 @@ endif test: test/runner ./test/runner test/runner: test/runner.cpp $(TEST_LIBS) copy-dat - $(QUIET_CXX)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS) + +$(QUIET_CXX)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS) test/runner.cpp: $(TESTS) @mkdir -p test $(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+