diff options
| author | ruki <[email protected]> | 2018-11-15 22:39:27 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-11-15 09:56:46 +0800 |
| commit | fa3a775ce5ba2320f6bba4386db2428a77151374 (patch) | |
| tree | 132faea360f28ea73fc00a69f6033a7dad4e7c81 /xmake/platforms/android/load.lua | |
| parent | b0cabeb7b3e21380073df6521cc9027b5ac3f1ca (diff) | |
improve sysroot order for android
Diffstat (limited to 'xmake/platforms/android/load.lua')
| -rw-r--r-- | xmake/platforms/android/load.lua | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index 3fc815265..1575ee4f9 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -120,17 +120,21 @@ function main(platform) } platform:add("cxflags", "-D__ANDROID_API__=" .. ndk_sdkver) platform:add("asflags", "-D__ANDROID_API__=" .. ndk_sdkver) - platform:add("cxflags", "--sysroot=" .. ndk_sysroot_be_r14) + platform:add("cflags", "--sysroot=" .. ndk_sysroot_be_r14) + platform:add("cxxflags","--sysroot=" .. ndk_sysroot_be_r14) platform:add("asflags", "--sysroot=" .. ndk_sysroot_be_r14) - platform:add("cxflags", "-isystem " .. path.join(ndk_sysroot_be_r14, "usr", "include", triples[arch])) + platform:add("cflags", "-isystem " .. path.join(ndk_sysroot_be_r14, "usr", "include", triples[arch])) + platform:add("cxxflags","-isystem " .. path.join(ndk_sysroot_be_r14, "usr", "include", triples[arch])) platform:add("asflags", "-isystem " .. path.join(ndk_sysroot_be_r14, "usr", "include", triples[arch])) else if arch:startswith("arm64") then - platform:add("cxflags", format("--sysroot=%s/arch-arm64", ndk_sdkdir)) - platform:add("asflags", format("--sysroot=%s/arch-arm64", ndk_sdkdir)) + platform:add("cflags", format("--sysroot=%s/arch-arm64", ndk_sdkdir)) + platform:add("cxxflags", format("--sysroot=%s/arch-arm64", ndk_sdkdir)) + platform:add("asflags", format("--sysroot=%s/arch-arm64", ndk_sdkdir)) else - platform:add("cxflags", format("--sysroot=%s/arch-arm", ndk_sdkdir)) - platform:add("asflags", format("--sysroot=%s/arch-arm", ndk_sdkdir)) + platform:add("cflags", format("--sysroot=%s/arch-arm", ndk_sdkdir)) + platform:add("cxxflags", format("--sysroot=%s/arch-arm", ndk_sdkdir)) + platform:add("asflags", format("--sysroot=%s/arch-arm", ndk_sdkdir)) end end if arch:startswith("arm64") then |