Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-11 07:14:07 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

More JSMESS breakage (nw)

Browse Source
This commit is contained in:
Justin Kerk 2015-01-28 15:47:03 +00:00
parent 8317717dd5
commit f56e1f309e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -931,7 +931,7 @@ $(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOP
$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
@echo Linking $@... @echo Linking $@...
ifeq ($(TARGETOS),emscripten) 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 $@ $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) -Wl,--start-group $^ -Wl,--end-group $(LIBS) -o $@
else else
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@ $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@

2
src/osd/modules/sound/sdl_sound.c
View File

@ -12,7 +12,7 @@
#include "sound_module.h" #include "sound_module.h"
#include "modules/osdmodule.h" #include "modules/osdmodule.h"
#if (!defined(SDLMAME_EMSCRIPTEN)) && (!defined(OSD_WINDOWS)) #if (!defined(OSD_WINDOWS))
// standard sdl header // standard sdl header
#include "../../sdl/sdlinc.h" #include "../../sdl/sdlinc.h"