summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-04 22:28:15 +0800
committerruki <[email protected]>2015-06-04 22:28:24 +0800
commit44fd11396d7b073e6b5227894c5db02b3585302f (patch)
treed755e4b6bd6c910559a3cb72dd32cd5d0d0e3f7c /xmake/scripts/platform
parentf0f9b217ddb81084a411d09a4a23292716b20c46 (diff)
impl auto rebuild and fix some bug
Diffstat (limited to 'xmake/scripts/platform')
-rw-r--r--xmake/scripts/platform/iphoneos/prober.lua4
-rw-r--r--xmake/scripts/platform/macosx/prober.lua2
-rw-r--r--xmake/scripts/platform/windows/prober.lua (renamed from xmake/scripts/platform/msvc/prober.lua)0
-rw-r--r--xmake/scripts/platform/windows/tools/cl.lua (renamed from xmake/scripts/platform/msvc/tools/cl.lua)0
-rw-r--r--xmake/scripts/platform/windows/tools/link.lua (renamed from xmake/scripts/platform/msvc/tools/link.lua)0
-rw-r--r--xmake/scripts/platform/windows/tools/nmake.lua (renamed from xmake/scripts/platform/msvc/tools/nmake.lua)0
-rw-r--r--xmake/scripts/platform/windows/windows.lua (renamed from xmake/scripts/platform/msvc/msvc.lua)26
7 files changed, 16 insertions, 16 deletions
diff --git a/xmake/scripts/platform/iphoneos/prober.lua b/xmake/scripts/platform/iphoneos/prober.lua
index 589e3a4b1..d5de4a7c5 100644
--- a/xmake/scripts/platform/iphoneos/prober.lua
+++ b/xmake/scripts/platform/iphoneos/prober.lua
@@ -135,12 +135,12 @@ function prober.config(configs)
if not prober._probe_xcode(configs) then return end
-- probe the xcode sdk version
- if not is_global and not prober._probe_xcode_sdkver(configs) then return end
+ if not prober._probe_xcode_sdkver(configs) then return end
end
-- probe the global configure
-function prober.config(configs)
+function prober.global(configs)
-- probe the xcode application directory
if not prober._probe_xcode(configs) then return end
diff --git a/xmake/scripts/platform/macosx/prober.lua b/xmake/scripts/platform/macosx/prober.lua
index e917d6817..3a3615293 100644
--- a/xmake/scripts/platform/macosx/prober.lua
+++ b/xmake/scripts/platform/macosx/prober.lua
@@ -129,7 +129,7 @@ end
function prober.config(configs)
-- probe the architecture
- if prober._probe_arch(configs) then return end
+ if not prober._probe_arch(configs) then return end
-- probe the xcode application directory
if not prober._probe_xcode(configs) then return end
diff --git a/xmake/scripts/platform/msvc/prober.lua b/xmake/scripts/platform/windows/prober.lua
index c730ad9f1..c730ad9f1 100644
--- a/xmake/scripts/platform/msvc/prober.lua
+++ b/xmake/scripts/platform/windows/prober.lua
diff --git a/xmake/scripts/platform/msvc/tools/cl.lua b/xmake/scripts/platform/windows/tools/cl.lua
index a8ab807a7..a8ab807a7 100644
--- a/xmake/scripts/platform/msvc/tools/cl.lua
+++ b/xmake/scripts/platform/windows/tools/cl.lua
diff --git a/xmake/scripts/platform/msvc/tools/link.lua b/xmake/scripts/platform/windows/tools/link.lua
index 52528ca6c..52528ca6c 100644
--- a/xmake/scripts/platform/msvc/tools/link.lua
+++ b/xmake/scripts/platform/windows/tools/link.lua
diff --git a/xmake/scripts/platform/msvc/tools/nmake.lua b/xmake/scripts/platform/windows/tools/nmake.lua
index 6d6b21258..6d6b21258 100644
--- a/xmake/scripts/platform/msvc/tools/nmake.lua
+++ b/xmake/scripts/platform/windows/tools/nmake.lua
diff --git a/xmake/scripts/platform/msvc/msvc.lua b/xmake/scripts/platform/windows/windows.lua
index 332b2b5f7..03e30864e 100644
--- a/xmake/scripts/platform/msvc/msvc.lua
+++ b/xmake/scripts/platform/windows/windows.lua
@@ -17,23 +17,23 @@
-- Copyright (C) 2009 - 2015, ruki All rights reserved.
--
-- @author ruki
--- @file msvc.lua
+-- @file windows.lua
--
--- define module: msvc
-local msvc = msvc or {}
+-- define module: windows
+local windows = windows or {}
-- load modules
local config = require("base/config")
-- init host
-msvc._HOST = "windows"
+windows._HOST = "windows"
-- init architectures
-msvc._ARCHS = {"x86", "x64"}
+windows._ARCHS = {"x86", "x64"}
-- make configure
-function msvc.make(configs)
+function windows.make(configs)
-- init the file formats
configs.formats = {}
@@ -54,28 +54,28 @@ function msvc.make(configs)
end
-- get the option menu for action: xmake config or global
-function msvc.menu(action)
+function windows.menu(action)
-- init config option menu
- msvc._MENU_CONFIG = msvc._MENU_CONFIG or
+ windows._MENU_CONFIG = windows._MENU_CONFIG or
{ {}
, {nil, "vs", "kv", "auto", "The Microsoft Visual Studio" }
, }
-- init global option menu
- msvc._MENU_GLOBAL = msvc._MENU_GLOBAL or
+ windows._MENU_GLOBAL = windows._MENU_GLOBAL or
{ {}
, {nil, "vs", "kv", "auto", "The Microsoft Visual Studio" }
, }
-- get the option menu
if action == "config" then
- return msvc._MENU_CONFIG
+ return windows._MENU_CONFIG
elseif action == "global" then
- return msvc._MENU_GLOBAL
+ return windows._MENU_GLOBAL
end
end
--- return module: msvc
-return msvc
+-- return module: windows
+return windows