mirror of
https://github.com/holub/mame
synced 2025-04-21 07:52:35 +03:00
Remove pnacl remains
This commit is contained in:
Miodrag Milanovic
parent
60706c1e93
commit
f317b4d534
@ -144,7 +144,6 @@ newoption {
|
||||
{ "freebsd", "FreeBSD" },
|
||||
{ "netbsd", "NetBSD" },
|
||||
{ "openbsd", "OpenBSD" },
|
||||
{ "pnacl", "Native Client - PNaCl" },
|
||||
{ "linux", "Linux" },
|
||||
{ "ios", "iOS" },
|
||||
{ "macosx", "OSX" },
|
||||
@ -785,11 +784,9 @@ local version = str_to_version(_OPTIONS["gcc_version"])
|
||||
"-std=c++17",
|
||||
}
|
||||
-- this speeds it up a bit by piping between the preprocessor/compiler/assembler
|
||||
if not ("pnacl" == _OPTIONS["gcc"]) then
|
||||
buildoptions {
|
||||
"-pipe",
|
||||
}
|
||||
end
|
||||
buildoptions {
|
||||
"-pipe",
|
||||
}
|
||||
-- add -g if we need symbols, and ensure we have frame pointers
|
||||
if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then
|
||||
buildoptions {
|
||||
@ -1075,7 +1072,7 @@ end
|
||||
|
||||
|
||||
local version = str_to_version(_OPTIONS["gcc_version"])
|
||||
if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then
|
||||
if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then
|
||||
if (version < 60000) then
|
||||
print("Clang version 6.0 or later needed")
|
||||
os.exit(-1)
|
||||
@ -1228,16 +1225,6 @@ configuration { "android-arm64" }
|
||||
"-Wno-asm-operand-widths",
|
||||
}
|
||||
|
||||
configuration { "pnacl" }
|
||||
buildoptions {
|
||||
"-std=gnu89",
|
||||
"-Wno-inline-new-delete",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++17",
|
||||
}
|
||||
archivesplit_size "20"
|
||||
|
||||
configuration { "linux-* or rpi or ci20"}
|
||||
links {
|
||||
"dl",
|
||||
|
||||
@ -878,16 +878,11 @@ end
|
||||
"LUA_COMPAT_5_1",
|
||||
"LUA_COMPAT_5_2",
|
||||
}
|
||||
if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") and not (_OPTIONS["targetos"]=="pnacl") then
|
||||
if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then
|
||||
defines {
|
||||
"LUA_USE_POSIX",
|
||||
}
|
||||
end
|
||||
if ("pnacl" == _OPTIONS["gcc"]) then
|
||||
defines {
|
||||
"LUA_32BITS",
|
||||
}
|
||||
end
|
||||
|
||||
configuration { }
|
||||
|
||||
@ -953,11 +948,6 @@ project "lualibs"
|
||||
"/wd4130", -- warning C4130: '==': logical operation on address of string constant
|
||||
}
|
||||
|
||||
configuration { "pnacl"}
|
||||
buildoptions {
|
||||
"-Wno-char-subscripts",
|
||||
}
|
||||
|
||||
configuration { }
|
||||
defines {
|
||||
"LUA_COMPAT_ALL",
|
||||
|
||||
@ -40,15 +40,6 @@ end
|
||||
"GLESv2",
|
||||
"SDL2",
|
||||
}
|
||||
configuration { "pnacl" }
|
||||
kind "ConsoleApp"
|
||||
targetextension ".pexe"
|
||||
links {
|
||||
"ppapi",
|
||||
"ppapi_gles2",
|
||||
"pthread",
|
||||
}
|
||||
|
||||
configuration { "winstore*" }
|
||||
kind "WindowedApp"
|
||||
|
||||
|
||||
@ -36,7 +36,6 @@ newoption {
|
||||
{ "openbsd", "OpenBSD" },
|
||||
{ "osx", "OSX (GCC compiler)" },
|
||||
{ "osx-clang", "OSX (Clang compiler)" },
|
||||
{ "pnacl", "Native Client - PNaCl" },
|
||||
{ "rpi", "RaspberryPi" },
|
||||
{ "solaris", "Solaris" },
|
||||
{ "steamlink", "Steam Link" },
|
||||
@ -303,25 +302,6 @@ function toolchain(_buildDir, _subDir)
|
||||
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
|
||||
end
|
||||
|
||||
if "pnacl" == _OPTIONS["gcc"] then
|
||||
|
||||
if not os.getenv("NACL_SDK_ROOT") then
|
||||
print("Set NACL_SDK_ROOT enviroment variables.")
|
||||
end
|
||||
|
||||
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_pnacl/bin/pnacl-"
|
||||
if os.is("macosx") then
|
||||
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_pnacl/bin/pnacl-"
|
||||
elseif os.is("linux") then
|
||||
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_pnacl/bin/pnacl-"
|
||||
end
|
||||
|
||||
premake.gcc.cc = naclToolchain .. "clang"
|
||||
premake.gcc.cxx = naclToolchain .. "clang++"
|
||||
premake.gcc.ar = naclToolchain .. "ar"
|
||||
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-pnacl")
|
||||
end
|
||||
|
||||
if "rpi" == _OPTIONS["gcc"] then
|
||||
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
|
||||
end
|
||||
@ -1021,36 +1001,6 @@ function toolchain(_buildDir, _subDir)
|
||||
"-Wno-extern-c-compat",
|
||||
}
|
||||
|
||||
configuration { "pnacl" }
|
||||
buildoptions {
|
||||
"-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,...
|
||||
"-fno-stack-protector",
|
||||
"-fdiagnostics-show-option",
|
||||
"-fdata-sections",
|
||||
"-ffunction-sections",
|
||||
"-Wunused-value",
|
||||
}
|
||||
|
||||
configuration { "pnacl" }
|
||||
buildoptions {
|
||||
"-Wno-tautological-undefined-compare",
|
||||
"-Wno-cast-align",
|
||||
}
|
||||
includedirs {
|
||||
"$(NACL_SDK_ROOT)/include",
|
||||
"$(NACL_SDK_ROOT)/include/pnacl",
|
||||
}
|
||||
|
||||
configuration { "pnacl" }
|
||||
targetdir (_buildDir .. "pnacl" .. "/bin")
|
||||
objdir (_buildDir .. "pnacl" .. "/obj")
|
||||
|
||||
configuration { "pnacl", "Debug" }
|
||||
libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Debug" }
|
||||
|
||||
configuration { "pnacl", "Release" }
|
||||
libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" }
|
||||
|
||||
configuration { "osx*", "x32", "not arm64" }
|
||||
objdir (_buildDir .. "osx_clang" .. "/obj")
|
||||
buildoptions {
|
||||
@ -1137,12 +1087,6 @@ function strip()
|
||||
"$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] or "$(MINGW32)/bin/") .. "strip -s \"$(TARGET)\"",
|
||||
}
|
||||
|
||||
configuration { "pnacl" }
|
||||
postbuildcommands {
|
||||
"$(SILENT) echo Running pnacl-finalize.",
|
||||
"$(SILENT) " .. naclToolchain .. "finalize \"$(TARGET)\""
|
||||
}
|
||||
|
||||
configuration { "asmjs" }
|
||||
postbuildcommands {
|
||||
"$(SILENT) echo Running asmjs finalize.",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user