diff options
| author | ruki <[email protected]> | 2020-06-20 00:38:29 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-06-19 21:50:59 +0800 |
| commit | f5392149886b2083ec0d6db2adef3da405297fe8 (patch) | |
| tree | 12a41f554b7e4bce55a8fb6f8e46aee2c4eba3f9 /xmake/rules/xcode | |
| parent | ca1bd50cc1e0b5939311ac73c61180957763cbbc (diff) | |
improve xcode and msvc toolchains
Diffstat (limited to 'xmake/rules/xcode')
| -rw-r--r-- | xmake/rules/xcode/info_plist/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/xcode/storyboard/xmake.lua | 15 | ||||
| -rw-r--r-- | xmake/rules/xcode/xcassets/xmake.lua | 9 |
3 files changed, 19 insertions, 7 deletions
diff --git a/xmake/rules/xcode/info_plist/xmake.lua b/xmake/rules/xcode/info_plist/xmake.lua index 611969e0c..6f1899f8e 100644 --- a/xmake/rules/xcode/info_plist/xmake.lua +++ b/xmake/rules/xcode/info_plist/xmake.lua @@ -60,7 +60,7 @@ rule("xcode.info_plist") PRODUCT_NAME = target:name(), PRODUCT_DISPLAY_NAME = target:name(), CURRENT_PROJECT_VERSION = target:version() and tostring(target:version()) or "1.0", - MACOSX_DEPLOYMENT_TARGET = get_config("target_minver") + MACOSX_DEPLOYMENT_TARGET = get_config("target_minver_macosx") } if target:rule("xcode.bundle") then maps.PRODUCT_BUNDLE_PACKAGE_TYPE = "BNDL" diff --git a/xmake/rules/xcode/storyboard/xmake.lua b/xmake/rules/xcode/storyboard/xmake.lua index bc9444d38..264525b61 100644 --- a/xmake/rules/xcode/storyboard/xmake.lua +++ b/xmake/rules/xcode/storyboard/xmake.lua @@ -57,11 +57,14 @@ rule("xcode.storyboard") os.tryrm(base_lproj) -- do compile + local target_minver local argv = {"--errors", "--warnings", "--notices", "--auto-activate-custom-fonts", "--output-format", "human-readable-text"} if is_plat("macosx") then + target_minver = get_config("target_minver_macosx") table.insert(argv, "--target-device") table.insert(argv, "mac") elseif is_plat("iphoneos") then + target_minver = get_config("target_minver_iphoneos") table.insert(argv, "--target-device") table.insert(argv, "iphone") table.insert(argv, "--target-device") @@ -69,8 +72,10 @@ rule("xcode.storyboard") else assert("unknown device!") end - table.insert(argv, "--minimum-deployment-target") - table.insert(argv, get_config("target_minver")) + if target_minver then + table.insert(argv, "--minimum-deployment-target") + table.insert(argv, target_minver) + end table.insert(argv, "--compilation-directory") table.insert(argv, base_lproj) table.insert(argv, sourcefile) @@ -82,8 +87,10 @@ rule("xcode.storyboard") table.insert(argv, "--target-device") table.insert(argv, "mac") end - table.insert(argv, "--minimum-deployment-target") - table.insert(argv, get_config("target_minver")) + if target_minver then + table.insert(argv, "--minimum-deployment-target") + table.insert(argv, target_minver) + end table.insert(argv, "--link") table.insert(argv, resourcesdir) table.insert(argv, path.join(base_lproj, path.filename(sourcefile) .. "c")) diff --git a/xmake/rules/xcode/xcassets/xmake.lua b/xmake/rules/xcode/xcassets/xmake.lua index df25794e5..6803a2999 100644 --- a/xmake/rules/xcode/xcassets/xmake.lua +++ b/xmake/rules/xcode/xcassets/xmake.lua @@ -60,13 +60,16 @@ rule("xcode.xcassets") io.writefile(assetcatalog_generated_info_plist, "") -- do compile + local target_minver local argv = {"--warnings", "--notices", "--output-format", "human-readable-text"} if is_plat("macosx") then + target_minver = get_config("target_minver_macosx") table.insert(argv, "--target-device") table.insert(argv, "mac") table.insert(argv, "--platform") table.insert(argv, "macosx") elseif is_plat("iphoneos") then + target_minver = get_config("target_minver_iphoneos") table.insert(argv, "--target-device") table.insert(argv, "iphone") table.insert(argv, "--target-device") @@ -76,8 +79,10 @@ rule("xcode.xcassets") else assert("unknown device!") end - table.insert(argv, "--minimum-deployment-target") - table.insert(argv, get_config("target_minver")) + if target_minver then + table.insert(argv, "--minimum-deployment-target") + table.insert(argv, target_minver) + end table.insert(argv, "--app-icon") table.insert(argv, "AppIcon") if is_plat("iphoneos") then |