modify platform and makefile

9 files changed, 21 insertions, 32 deletions

diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua
index 7b1ca2e7d..e6121d8a2 100644
--- a/xmake/scripts/base/makefile.lua
+++ b/xmake/scripts/base/makefile.lua
@@ -183,7 +183,8 @@ function makefile._make_target(file, name, target)
     local verbose = cmd:gsub("[%s=\"<]", function (w) return string.format("%%%x", w:byte()) end)
     -- too long?
     if verbose and #verbose > 256 then
-        verbose = verbose:sub(1, 256) .. " ..."
+        verbose = linker.make(l, target, {rule.filename("*", "object")}, targetfile)
+        verbose = verbose:gsub("[%s=\"<]", function (w) return string.format("%%%x", w:byte()) end)
     end
 
     -- make body
diff --git a/xmake/scripts/platform/android/android.lua b/xmake/scripts/platform/android/android.lua
index 62c862970..1b4974b73 100644
--- a/xmake/scripts/platform/android/android.lua
+++ b/xmake/scripts/platform/android/android.lua
@@ -62,9 +62,10 @@ function android.make(configs)
     configs.shflags     = { "-march=" .. config.get("arch"), "-llog" }
 
     -- add flags for the sdk directory of ndk
-    local ndk_sdkdir = config.get("__ndk_sdkdir")
-    if ndk_sdkdir then
-        ndk_sdkdir = path.translate(ndk_sdkdir) 
+    local ndk = config.get("ndk")
+    local ndk_sdkver = config.get("ndk_sdkver")
+    if ndk and ndk_sdkver then
+        local ndk_sdkdir = path.translate(string.format("%s/platforms/android-%d", ndk, ndk_sdkver)) 
         table.insert(configs.cxflags, string.format("--sysroot=%s/arch-arm", ndk_sdkdir))
         table.insert(configs.asflags, string.format("--sysroot=%s/arch-arm", ndk_sdkdir))
         table.insert(configs.ldflags, string.format("--sysroot=%s/arch-arm", ndk_sdkdir))
diff --git a/xmake/scripts/platform/android/prober.lua b/xmake/scripts/platform/android/prober.lua
index 756dcec50..d01a49d5c 100644
--- a/xmake/scripts/platform/android/prober.lua
+++ b/xmake/scripts/platform/android/prober.lua
@@ -87,7 +87,6 @@ function prober._probe_ndk_sdkver(configs)
 
         -- save it
         configs.set("ndk_sdkver", ndk_sdkver)
-        configs.set("__ndk_sdkdir", string.format("%s/platforms/android-%d", ndk, ndk_sdkver))
 
         -- trace
         utils.verbose("checking for the SDK version of NDK ... %s", string.format("android-%d", ndk_sdkver))
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua
index c02513b08..8656d20cc 100644
--- a/xmake/scripts/platform/iphoneos/iphoneos.lua
+++ b/xmake/scripts/platform/iphoneos/iphoneos.lua
@@ -66,10 +66,12 @@ function iphoneos.make(configs)
     configs.asflags     = { archflags }
     configs.ldflags     = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=6.0" }
     configs.shflags     = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=6.0" }
-
+ 
     -- init flags for the xcode sdk directory
-    local xcode_sdkdir = config.get("__xcode_sdkdir")
-    if xcode_sdkdir then
+    local xcode_dir     = config.get("xcode_dir")
+    local xcode_sdkver  = config.get("xcode_sdkver")
+    if xcode_dir and xcode_sdkver then
+        local xcode_sdkdir = xcode_dir .. "/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" .. xcode_sdkver .. ".sdk"
         table.insert(configs.cxflags, "-isysroot " .. xcode_sdkdir)
         table.insert(configs.asflags, "-isysroot " .. xcode_sdkdir)
         table.insert(configs.mxflags, "-isysroot " .. xcode_sdkdir)
diff --git a/xmake/scripts/platform/iphoneos/prober.lua b/xmake/scripts/platform/iphoneos/prober.lua
index 1d6b34f2c..3de0965de 100644
--- a/xmake/scripts/platform/iphoneos/prober.lua
+++ b/xmake/scripts/platform/iphoneos/prober.lua
@@ -125,12 +125,6 @@ function prober._probe_xcode_sdkver(configs)
         
         -- save it
         configs.set("xcode_sdkver", xcode_sdkver)
- 
-        -- save the xcode sdk directory
-        local xcode_dir = configs.get("xcode_dir")
-        if xcode_dir then
-            configs.set("__xcode_sdkdir", xcode_dir .. "/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" .. xcode_sdkver .. ".sdk")
-        end
     
         -- trace
         utils.verbose("checking for the Xcode SDK version for %s ... %s", configs.get("plat"), xcode_sdkver)
diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
index 6b059caaa..87c3970b9 100644
--- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
+++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
@@ -65,10 +65,12 @@ function iphonesimulator.make(configs)
     configs.asflags     = { archflags }
     configs.ldflags     = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=5.0" }
     configs.shflags     = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=5.0" }
-
+ 
     -- init flags for the xcode sdk directory
-    local xcode_sdkdir = config.get("__xcode_sdkdir")
-    if xcode_sdkdir then
+    local xcode_dir     = config.get("xcode_dir")
+    local xcode_sdkver  = config.get("xcode_sdkver")
+    if xcode_dir and xcode_sdkver then
+        local xcode_sdkdir = xcode_dir .. "/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" .. xcode_sdkver .. ".sdk"
         table.insert(configs.cxflags, "-isysroot " .. xcode_sdkdir)
         table.insert(configs.asflags, "-isysroot " .. xcode_sdkdir)
         table.insert(configs.mxflags, "-isysroot " .. xcode_sdkdir)
diff --git a/xmake/scripts/platform/iphonesimulator/prober.lua b/xmake/scripts/platform/iphonesimulator/prober.lua
index 5834486eb..e1002ec32 100644
--- a/xmake/scripts/platform/iphonesimulator/prober.lua
+++ b/xmake/scripts/platform/iphonesimulator/prober.lua
@@ -125,13 +125,7 @@ function prober._probe_xcode_sdkver(configs)
         
         -- save it
         configs.set("xcode_sdkver", xcode_sdkver)
- 
-        -- save the xcode sdk directory
-        local xcode_dir = configs.get("xcode_dir")
-        if xcode_dir then
-            configs.set("__xcode_sdkdir", xcode_dir .. "/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" .. xcode_sdkver .. ".sdk")
-        end
-    
+
         -- trace
         utils.verbose("checking for the Xcode SDK version for %s ... %s", configs.get("plat"), xcode_sdkver)
     else
diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua
index 9866209e2..6e08778d5 100644
--- a/xmake/scripts/platform/macosx/macosx.lua
+++ b/xmake/scripts/platform/macosx/macosx.lua
@@ -67,8 +67,10 @@ function macosx.make(configs)
     configs.shflags     = { archflags, "-mmacosx-version-min=10.7", "-stdlib=libc++", "-lz" }
 
     -- init flags for the xcode sdk directory
-    local xcode_sdkdir = config.get("__xcode_sdkdir")
-    if xcode_sdkdir then
+    local xcode_dir     = config.get("xcode_dir")
+    local xcode_sdkver  = config.get("xcode_sdkver")
+    if xcode_dir and xcode_sdkver then
+        local xcode_sdkdir = xcode_dir .. "/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk"
         table.insert(configs.cxflags, "-isysroot " .. xcode_sdkdir)
         table.insert(configs.asflags, "-isysroot " .. xcode_sdkdir)
         table.insert(configs.mxflags, "-isysroot " .. xcode_sdkdir)
diff --git a/xmake/scripts/platform/macosx/prober.lua b/xmake/scripts/platform/macosx/prober.lua
index ddf2b7e4c..0e126f38c 100644
--- a/xmake/scripts/platform/macosx/prober.lua
+++ b/xmake/scripts/platform/macosx/prober.lua
@@ -126,12 +126,6 @@ function prober._probe_xcode_sdkver(configs)
         -- save it
         configs.set("xcode_sdkver", xcode_sdkver)
 
-        -- save the xcode sdk directory
-        local xcode_dir = configs.get("xcode_dir")
-        if xcode_dir then
-            configs.set("__xcode_sdkdir", xcode_dir .. "/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk")
-        end
-    
         -- trace
         utils.verbose("checking for the Xcode SDK version for %s ... %s", configs.get("plat"), xcode_sdkver)
     else