Previous 199869 Revisions Next

r33232 Thursday 6th November, 2014 at 07:12:54 UTC by Justin Kerk
Build fixes for Emscripten (nw)
[/trunk]makefile
[src/osd/sdl]sdl.mak

trunk/makefile
r241743r241744
910910   $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
911911   @echo Linking $@...
912912ifeq ($(TARGETOS),emscripten)
913   # Emscripten's linker seems to be stricter about the ordering of .a files
913# Emscripten's linker seems to be stricter about the ordering of .a files
914914   $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) -Wl,--start-group $^ -Wl,--end-group $(LIBS) -o $@
915915else
916916   $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@
trunk/src/osd/sdl/sdl.mak
r241743r241744
8383OSDSRC = $(SRC)/osd
8484OSDOBJ = $(OBJ)/osd
8585
86# default to SDL2 for non-OS/2 builds now
86# default to SDL2 for non-OS/2, non-Emscripten builds now
8787ifndef SDL_LIBVER
8888ifneq ($(TARGETOS),os2)
89ifneq ($(TARGETOS),emscripten)
8990SDL_LIBVER = sdl2
9091else
9192SDL_LIBVER = sdl
9293endif
94else
95SDL_LIBVER = sdl
9396endif
97endif
9498
9599ifndef NO_USE_QTDEBUG
96100OBJDIRS += $(OSDOBJ)/modules/debugger/qt
r241743r241744
258262NO_USE_XINPUT = 1
259263NO_USE_MIDI = 1
260264NO_USE_QTDEBUG = 1
265DONT_USE_NETWORK = 1
261266endif
262267
263268ifeq ($(TARGETOS),macosx)
r241743r241744
779784LIBS += -lpcap
780785endif
781786endif
787else
788OSDOBJS += $(SDLOBJ)/netdev.o
782789endif
783790
784791#-------------------------------------------------

https://github.com/mamedev/mame/commit/5e52630af1d44b1dc72331d20362c74ba6034a53

Previous 199869 Revisions Next

© 1997-2024 The MAME Team