diff options
| author | ruki <[email protected]> | 2015-06-11 21:56:03 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-11 21:56:03 +0800 |
| commit | c2e614548b92821c8396e2a2e9f06afeb97cc7bd (patch) | |
| tree | ea54e043c6f065fce7a778e459440d138a075b54 /xmake/scripts/platform | |
| parent | 5198147b0b71e43883f4454eaabecfec9b8f9c74 (diff) | |
optimizate to find tool script
Diffstat (limited to 'xmake/scripts/platform')
| -rw-r--r-- | xmake/scripts/platform/android/android.lua | 12 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphonesimulator/iphonesimulator.lua | 4 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphonesimulator/prober.lua | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/xmake/scripts/platform/android/android.lua b/xmake/scripts/platform/android/android.lua index b8e91a09f..fe1c14cb7 100644 --- a/xmake/scripts/platform/android/android.lua +++ b/xmake/scripts/platform/android/android.lua @@ -40,6 +40,18 @@ function android.make(configs) configs.formats.static = {"lib", ".a"} configs.formats.object = {"", ".o"} configs.formats.shared = {"lib", ".so"} + + -- init the toolchains + configs.tools = {} + configs.tools.make = "make" + configs.tools.ccache = config.get("__ccache") + configs.tools.cc = config.get("cc") or "arm-linux-androideabi-gcc" + configs.tools.cxx = config.get("cxx") or "arm-linux-androideabi-g++" + configs.tools.mm = config.get("mm") or configs.tools.cc + configs.tools.mxx = config.get("mxx") or configs.tools.cxx + configs.tools.ld = config.get("ld") or "arm-linux-androideabi-g++" + configs.tools.ar = config.get("ar") or "arm-linux-androideabi-ar" + configs.tools.sh = config.get("sh") or "arm-linux-androideabi-g++" end diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua index effab15c3..5189eb9ed 100644 --- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua +++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua @@ -27,10 +27,10 @@ local iphonesimulator = iphonesimulator or {} local config = require("base/config") -- init host -iphonesimulator._HOST = "macosx" +iphonesimulator._HOST = "macosx" -- init architectures -iphonesimulator._ARCHS = {"x86", "x64"} +iphonesimulator._ARCHS = {"i386"} -- make configure function iphonesimulator.make(configs) diff --git a/xmake/scripts/platform/iphonesimulator/prober.lua b/xmake/scripts/platform/iphonesimulator/prober.lua index 419becf12..9d48d5f15 100644 --- a/xmake/scripts/platform/iphonesimulator/prober.lua +++ b/xmake/scripts/platform/iphonesimulator/prober.lua @@ -42,7 +42,7 @@ function prober._probe_arch(configs) if arch then return true end -- init the default architecture - configs.set("arch", "x86") + configs.set("arch", "i386") -- trace utils.verbose("checking the architecture ... %s", configs.get("arch")) |