diff options
| author | 2014-08-05 01:41:02 +0000 | |
|---|---|---|
| committer | 2014-08-05 01:41:02 +0000 | |
| commit | f6717f5eed60882cf7cc72b099b03a2fd3fdf407 (patch) | |
| tree | c85442f3b7cf750c3e3267476e7fb6085cd34558 | |
| parent | bcc3b4e13c40334d13a1a4102985da57d32f3529 (diff) | |
Work around linking issue with JSMESS (nw)
See https://github.com/kripken/emscripten/issues/2619 for discussion
| -rw-r--r-- | makefile | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -888,7 +888,12 @@ ifndef EXECUTABLE_DEFINED $(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOPTIONAL) $(LIBEMU) $(LIBDASM) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(SQLITE3_LIB) $(WEB_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE) $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) @echo Linking $@... +ifeq ($(TARGETOS),emscripten) + # Emscripten's linker seems to be stricter about the ordering of .a files + $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) -Wl,--start-group $^ -Wl,--end-group $(LIBS) -o $@ +else $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@ +endif ifeq ($(TARGETOS),win32) ifdef SYMBOLS ifndef MSVC_BUILD |
