summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2021-10-26 10:32:43 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2021-10-26 10:32:43 +0200
commitf317b4d5342eafbee5900ffa685673fdd17f398d (patch)
tree211e8c3996f9b3704d50dbf3a622b53d541f4b0d /scripts
parent60706c1e933d8533232157241a576f96a229380e (diff)
Remove pnacl remains
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua21
-rw-r--r--scripts/src/3rdparty.lua12
-rw-r--r--scripts/src/main.lua9
-rw-r--r--scripts/toolchain.lua56
4 files changed, 5 insertions, 93 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 2d53bda770b..e427c30e544 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -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",
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index fff3b94f0c8..c3748d688b3 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -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",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 992f883f3c8..067cd8ad27a 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -40,15 +40,6 @@ end
"GLESv2",
"SDL2",
}
- configuration { "pnacl" }
- kind "ConsoleApp"
- targetextension ".pexe"
- links {
- "ppapi",
- "ppapi_gles2",
- "pthread",
- }
-
configuration { "winstore*" }
kind "WindowedApp"
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 5fc886e1f48..72035a90110 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -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.",