From 46b916d7b1771115543baf870fbcbe2b0d8e85db Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 22 Feb 2015 02:31:31 +0100 Subject: Fix ldplayer linking. (nw) --- makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index d4534f5310c..c8d2b67c081 100644 --- a/makefile +++ b/makefile @@ -943,14 +943,13 @@ else EMULATOROBJ = $(EMULATOROBJLIST) endif -$(EMULATOR): $(EMULATOROBJ) $(SRC)/version.c - $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) +$(EMULATOR): $(VERSIONOBJ) $(EMULATOROBJ) @echo Linking $@... ifeq ($(TARGETOS),emscripten) # Emscripten's linker seems to be stricter about the ordering of files $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) -Wl,--start-group $(EMULATOROBJ) -Wl,--end-group $(LIBS) -o $@ else - $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $(EMULATOROBJ) $(LIBS) -o $@ + $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ endif ifeq ($(TARGETOS),win32) ifdef SYMBOLS -- cgit v1.2.3