mirror of
https://github.com/holub/mame
synced 2025-06-10 14:52:42 +03:00
Emscripten build fixes (nw)
This commit is contained in:
parent
548678d5cd
commit
85d74eb2c9
2
makefile
2
makefile
@ -925,7 +925,7 @@ ifndef EMSCRIPTEN
|
||||
$(error EMSCRIPTEN is not set)
|
||||
endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=asmjs --gcc_version=4.8 gmake
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=asmjs --gcc_version=4.9 gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-asmjs config=$(CONFIG)
|
||||
|
||||
|
@ -59,7 +59,7 @@ project "zlib"
|
||||
kind "StaticLib"
|
||||
|
||||
local version = str_to_version(_OPTIONS["gcc_version"])
|
||||
if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
|
||||
if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then
|
||||
configuration { "gmake" }
|
||||
if (version >= 30700) then
|
||||
buildoptions {
|
||||
|
Loading…
Reference in New Issue
Block a user