diff options
| author | ruki <[email protected]> | 2015-06-15 14:41:00 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-15 14:41:00 +0800 |
| commit | 351b402b8d0f5ee48097742c7b59a53054dd10ef (patch) | |
| tree | edf2696bd2a1035eaa113f124344ca0e6d5a9a65 /xmake/scripts/platform | |
| parent | 2ff2b14ec02d4d2ec77d26213412c1b82473bf8d (diff) | |
add os name
Diffstat (limited to 'xmake/scripts/platform')
| -rw-r--r-- | xmake/scripts/platform/android/android.lua | 7 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphoneos/iphoneos.lua | 3 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphonesimulator/iphonesimulator.lua | 3 | ||||
| -rw-r--r-- | xmake/scripts/platform/linux/linux.lua | 3 | ||||
| -rw-r--r-- | xmake/scripts/platform/macosx/macosx.lua | 3 | ||||
| -rw-r--r-- | xmake/scripts/platform/mingw/mingw.lua | 3 | ||||
| -rw-r--r-- | xmake/scripts/platform/platform.lua | 7 | ||||
| -rw-r--r-- | xmake/scripts/platform/windows/windows.lua | 3 |
8 files changed, 30 insertions, 2 deletions
diff --git a/xmake/scripts/platform/android/android.lua b/xmake/scripts/platform/android/android.lua index 4774b79b5..62c862970 100644 --- a/xmake/scripts/platform/android/android.lua +++ b/xmake/scripts/platform/android/android.lua @@ -27,10 +27,13 @@ local android = android or {} local config = require("base/config") -- init host -android._HOST = xmake._HOST +android._HOST = xmake._HOST + +-- init os +android._OS = "android" -- init architectures -android._ARCHS = {"armv5te", "armv6", "armv7-a"} +android._ARCHS = {"armv5te", "armv6", "armv7-a"} -- make configure function android.make(configs) diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua index c66119e15..9b9b4dd50 100644 --- a/xmake/scripts/platform/iphoneos/iphoneos.lua +++ b/xmake/scripts/platform/iphoneos/iphoneos.lua @@ -29,6 +29,9 @@ local config = require("base/config") -- init host iphoneos._HOST = "macosx" +-- init os +iphoneos._OS = "ios" + -- init architectures iphoneos._ARCHS = {"armv7", "armv7s", "arm64"} diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua index db3f1c8c7..6b059caaa 100644 --- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua +++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua @@ -29,6 +29,9 @@ local config = require("base/config") -- init host iphonesimulator._HOST = "macosx" +-- init os +iphonesimulator._OS = "ios" + -- init architectures iphonesimulator._ARCHS = {"i386", "x86_64"} diff --git a/xmake/scripts/platform/linux/linux.lua b/xmake/scripts/platform/linux/linux.lua index 9ce5f447e..82b934ee4 100644 --- a/xmake/scripts/platform/linux/linux.lua +++ b/xmake/scripts/platform/linux/linux.lua @@ -29,6 +29,9 @@ local config = require("base/config") -- init host linux._HOST = "linux" +-- init os +linux._OS = "linux" + -- init architectures linux._ARCHS = {"i386", "x86_64"} diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua index f413fd759..9866209e2 100644 --- a/xmake/scripts/platform/macosx/macosx.lua +++ b/xmake/scripts/platform/macosx/macosx.lua @@ -29,6 +29,9 @@ local config = require("base/config") -- init host macosx._HOST = "macosx" +-- init os +macosx._OS = "macosx" + -- init architectures macosx._ARCHS = {"i386", "x86_64"} diff --git a/xmake/scripts/platform/mingw/mingw.lua b/xmake/scripts/platform/mingw/mingw.lua index 466305753..430d3519a 100644 --- a/xmake/scripts/platform/mingw/mingw.lua +++ b/xmake/scripts/platform/mingw/mingw.lua @@ -29,6 +29,9 @@ local config = require("base/config") -- init host mingw._HOST = xmake._HOST +-- init os +mingw._OS = "windows" + -- init architectures mingw._ARCHS = {"i386", "x86_64"} diff --git a/xmake/scripts/platform/platform.lua b/xmake/scripts/platform/platform.lua index 07981c40a..a84f80187 100644 --- a/xmake/scripts/platform/platform.lua +++ b/xmake/scripts/platform/platform.lua @@ -161,6 +161,13 @@ function platform.make() return platform._configs(config.get("plat")) end +-- get the platform os +function platform.os() + + -- ok? + return platform.module()._OS +end + -- get the given configure function platform.get(name) diff --git a/xmake/scripts/platform/windows/windows.lua b/xmake/scripts/platform/windows/windows.lua index 4c9d11e8f..2203b57e4 100644 --- a/xmake/scripts/platform/windows/windows.lua +++ b/xmake/scripts/platform/windows/windows.lua @@ -30,6 +30,9 @@ local config = require("base/config") -- init host windows._HOST = "windows" +-- init os +windows._OS = "windows" + -- init architectures windows._ARCHS = {"i386", "x86_64"} |
