mirror of
https://github.com/bkaradzic/bx.git
synced 2026-02-17 20:52:37 +01:00
Cleanup.
This commit is contained in:
@@ -70,7 +70,6 @@ function toolchain(_buildDir, _libDir)
|
||||
{ "android-x86_64", "Android - x86_64" },
|
||||
{ "wasm2js", "Emscripten/Wasm2JS" },
|
||||
{ "wasm", "Emscripten/Wasm" },
|
||||
{ "freebsd", "FreeBSD" },
|
||||
{ "linux-gcc", "Linux (GCC compiler)" },
|
||||
{ "linux-gcc-afl", "Linux (GCC + AFL fuzzer)" },
|
||||
{ "linux-clang", "Linux (Clang compiler)" },
|
||||
@@ -88,7 +87,6 @@ function toolchain(_buildDir, _libDir)
|
||||
{ "tvos-simulator", "tvOS - Simulator" },
|
||||
{ "mingw-gcc", "MinGW" },
|
||||
{ "mingw-clang", "MinGW (clang compiler)" },
|
||||
{ "netbsd", "NetBSD" },
|
||||
{ "osx-x64", "OSX - x64" },
|
||||
{ "osx-arm64", "OSX - ARM64" },
|
||||
{ "orbis", "Orbis" },
|
||||
@@ -259,9 +257,6 @@ function toolchain(_buildDir, _libDir)
|
||||
premake.gcc.namestyle = "Emscripten"
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-" .. _OPTIONS["gcc"]))
|
||||
|
||||
elseif "freebsd" == _OPTIONS["gcc"] then
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-freebsd"))
|
||||
|
||||
elseif "ios-arm" == _OPTIONS["gcc"]
|
||||
or "ios-arm64" == _OPTIONS["gcc"] then
|
||||
premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
|
||||
@@ -358,13 +353,9 @@ function toolchain(_buildDir, _libDir)
|
||||
-- premake.gcc.llvm = true
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-mingw-clang"))
|
||||
|
||||
elseif "netbsd" == _OPTIONS["gcc"] then
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-netbsd"))
|
||||
|
||||
elseif "osx-x64" == _OPTIONS["gcc"]
|
||||
or "osx-arm64" == _OPTIONS["gcc"] then
|
||||
|
||||
|
||||
if os.is("linux") then
|
||||
if not os.getenv("OSXCROSS") then
|
||||
print("Set OSXCROSS environment variable.")
|
||||
@@ -918,23 +909,6 @@ function toolchain(_buildDir, _libDir)
|
||||
objdir (path.join(_buildDir, "wasm/obj"))
|
||||
libdirs { path.join(_libDir, "lib/wasm") }
|
||||
|
||||
configuration { "freebsd" }
|
||||
targetdir (path.join(_buildDir, "freebsd/bin"))
|
||||
objdir (path.join(_buildDir, "freebsd/obj"))
|
||||
libdirs { path.join(_libDir, "lib/freebsd") }
|
||||
includedirs {
|
||||
path.join(bxDir, "include/compat/freebsd"),
|
||||
}
|
||||
|
||||
configuration { "xbox360" }
|
||||
targetdir (path.join(_buildDir, "xbox360/bin"))
|
||||
objdir (path.join(_buildDir, "xbox360/obj"))
|
||||
includedirs { path.join(bxDir, "include/compat/msvc") }
|
||||
libdirs { path.join(_libDir, "lib/xbox360") }
|
||||
defines {
|
||||
"NOMINMAX",
|
||||
}
|
||||
|
||||
configuration { "durango" }
|
||||
targetdir (path.join(_buildDir, "durango/bin"))
|
||||
objdir (path.join(_buildDir, "durango/obj"))
|
||||
@@ -945,14 +919,6 @@ function toolchain(_buildDir, _libDir)
|
||||
"NOMINMAX",
|
||||
}
|
||||
|
||||
configuration { "netbsd" }
|
||||
targetdir (path.join(_buildDir, "netbsd/bin"))
|
||||
objdir (path.join(_buildDir, "netbsd/obj"))
|
||||
libdirs { path.join(_libDir, "lib/netbsd") }
|
||||
includedirs {
|
||||
path.join(bxDir, "include/compat/freebsd"),
|
||||
}
|
||||
|
||||
configuration { "osx-x64" }
|
||||
targetdir (path.join(_buildDir, "osx-x64/bin"))
|
||||
objdir (path.join(_buildDir, "osx-x64/obj"))
|
||||
|
||||
Reference in New Issue
Block a user