Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MinGW Linux cross-compile.

Browse Source
This commit is contained in:
Branimir Karadžić
2016-08-10 22:07:19 -07:00
parent e4acc73f0b
commit 6539026df9
1 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/toolchain.lua
View File

@@ -61,7 +61,6 @@ function toolchain(_buildDir, _libDir)
},
}
newoption {
trigger = "xcode",
value = "xcode_target",
@@ -74,28 +73,33 @@ function toolchain(_buildDir, _libDir)
}
newoption {
trigger = "with-android",
value = "#",
trigger = "with-android",
value = "#",
description = "Set Android platform version (default: android-14).",
}
newoption {
trigger = "with-ios",
value = "#",
trigger = "with-ios",
value = "#",
description = "Set iOS target version (default: 8.0).",
}
newoption {
trigger = "with-tvos",
value = "#",
trigger = "with-tvos",
value = "#",
description = "Set tvOS target version (default: 9.0).",
}
newoption {
trigger = "with-dynamic-runtime",
trigger = "with-dynamic-runtime",
description = "Dynamically link with the runtime rather than statically",
}
newoption {
trigger = "with-32bit-compiler",
description = "Use 32-bit compiler instead 64-bit.",
}
-- Avoid error when invoking genie --help.
if (_ACTION == nil) then return false end
@@ -122,6 +126,11 @@ function toolchain(_buildDir, _libDir)
tvosPlatform = _OPTIONS["with-tvos"]
end
local compiler32bit = false
if _OPTIONS["with-32bit-compiler"] then
compiler32bit = true
end
if _ACTION == "gmake" or _ACTION == "ninja" then
if nil == _OPTIONS["gcc"] then
@@ -249,8 +258,17 @@ function toolchain(_buildDir, _libDir)
location (path.join(_buildDir, "projects", _ACTION .. "-linux-steamlink"))
elseif "mingw-gcc" == _OPTIONS["gcc"] then
premake.gcc.cc = "$(MINGW)/bin/x86_64-w64-mingw32-gcc"
premake.gcc.cxx = "$(MINGW)/bin/x86_64-w64-mingw32-g++"
local mingwToolchain = "x86_64-w64-mingw32"
if compiler32bit then
if os.is("linux") then
mingwToolchain = "i686-w64-mingw32"
else
mingwToolchain = "mingw32"
end
end
premake.gcc.cc = "$(MINGW)/bin/" .. mingwToolchain .. "-gcc"
premake.gcc.cxx = "$(MINGW)/bin/" .. mingwToolchain .. "-g++"
premake.gcc.ar = "$(MINGW)/bin/ar"
location (path.join(_buildDir, "projects", _ACTION .. "-mingw-gcc"))
@@ -304,10 +322,14 @@ function toolchain(_buildDir, _libDir)
elseif "osx" == _OPTIONS["gcc"] then
if os.is("linux") then
if not os.getenv("OSXCROSS") then
print("Set OSXCROSS enviroment variable.")
end
local osxToolchain = "x86_64-apple-darwin15-"
premake.gcc.cc = osxToolchain .. "clang"
premake.gcc.cxx = osxToolchain .. "clang++"
premake.gcc.ar = osxToolchain .. "ar"
premake.gcc.cc = "$(OSXCROSS)/target/bin/" .. osxToolchain .. "clang"
premake.gcc.cxx = "$(OSXCROSS)/target/bin/" .. osxToolchain .. "clang++"
premake.gcc.ar = "$(OSXCROSS)/target/bin/" .. osxToolchain .. "ar"
end
location (path.join(_buildDir, "projects", _ACTION .. "-osx"))