diff options
author | Justin Kerk <dopefishjustin@gmail.com> | 2015-01-28 15:47:03 +0000 |
---|---|---|
committer | Justin Kerk <dopefishjustin@gmail.com> | 2015-01-28 15:47:03 +0000 |
commit | f56e1f309e30b8f7c10313ba512880e02df7d8cd (patch) | |
tree | 447aff0da65d0539813891c19484299801749b64 | |
parent | 8317717dd546c6133d5685d39863477d8bc200da (diff) |
More JSMESS breakage (nw)
-rw-r--r-- | makefile | 2 | ||||
-rw-r--r-- | src/osd/modules/sound/sdl_sound.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -931,7 +931,7 @@ $(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOP $(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 +# 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 $@ diff --git a/src/osd/modules/sound/sdl_sound.c b/src/osd/modules/sound/sdl_sound.c index 1c80ab85082..185cb9976e7 100644 --- a/src/osd/modules/sound/sdl_sound.c +++ b/src/osd/modules/sound/sdl_sound.c @@ -12,7 +12,7 @@ #include "sound_module.h" #include "modules/osdmodule.h" -#if (!defined(SDLMAME_EMSCRIPTEN)) && (!defined(OSD_WINDOWS)) +#if (!defined(OSD_WINDOWS)) // standard sdl header #include "../../sdl/sdlinc.h" |