summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author夕伽 <[email protected]>2018-09-04 14:14:38 +0800
committer夕伽 <[email protected]>2018-09-04 14:14:38 +0800
commitb5fbcacc984da4f5c6095fae0c9f321e4561e328 (patch)
treeb99c9a401327ffbae8ca70f1778f55deecf6b614
parent3cb295e071987b72cb78223781a7632d0a41d5cf (diff)
add win.sdk.mfc for checking the env of vs
rename: win.sdk.mfcapp.shared -> win.sdk.mfc.shared_app win.sdk.mfcapp.static -> win.sdk.mfc.static_app
-rw-r--r--xmake/rules/winsdk/mfc/env/xmake.lua30
-rw-r--r--xmake/rules/winsdk/mfc/mfc.lua2
-rw-r--r--xmake/rules/winsdk/mfc/xmake.lua20
3 files changed, 40 insertions, 12 deletions
diff --git a/xmake/rules/winsdk/mfc/env/xmake.lua b/xmake/rules/winsdk/mfc/env/xmake.lua
new file mode 100644
index 000000000..dbf28907d
--- /dev/null
+++ b/xmake/rules/winsdk/mfc/env/xmake.lua
@@ -0,0 +1,30 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015 - 2018, TBOOX Open Source Group.
+--
+-- @author xigal
+-- @file xmake.lua
+--
+
+-- define rule: mfc
+rule("win.sdk.mfc")
+
+ -- FIXME: before load need check of vs's minverion, if defined
+ --before_load(function (target)
+ --end) \ No newline at end of file
diff --git a/xmake/rules/winsdk/mfc/mfc.lua b/xmake/rules/winsdk/mfc/mfc.lua
index 1cba4752e..3e3f013ac 100644
--- a/xmake/rules/winsdk/mfc/mfc.lua
+++ b/xmake/rules/winsdk/mfc/mfc.lua
@@ -18,7 +18,7 @@
--
-- Copyright (C) 2015 - 2018, TBOOX Open Source Group.
--
--- @author ruki
+-- @author xigal
-- @file xmake.lua
--
diff --git a/xmake/rules/winsdk/mfc/xmake.lua b/xmake/rules/winsdk/mfc/xmake.lua
index 6e1761e48..e711d986b 100644
--- a/xmake/rules/winsdk/mfc/xmake.lua
+++ b/xmake/rules/winsdk/mfc/xmake.lua
@@ -18,16 +18,15 @@
--
-- Copyright (C) 2015 - 2018, TBOOX Open Source Group.
--
--- @author ruki
+-- @author xigal
-- @file xmake.lua
--
--- define rule: shared mfcapp
-rule("win.sdk.mfcapp.shared")
+-- define rule: sharedcapp
+rule("win.sdk.mfc.shared_app")
- -- FIXME: before load need check of vs's minverion, if defined
- --before_load(function (target)
- --end)
+ -- add mfc base rule
+ add_deps("win.sdk.mfc")
-- after load
after_load(function (target)
@@ -36,12 +35,11 @@ rule("win.sdk.mfcapp.shared")
import("mfc").mfc_shared_app(target)
end)
--- define rule: static mfcapp
-rule("win.sdk.mfcapp.static")
+-- define rule: staticapp
+rule("win.sdk.mfc.static_app")
- -- FIXME: before load need check of vs's minverion, if defined
- --before_load(function (target)
- --end)
+ -- add mfc base rule
+ add_deps("win.sdk.mfc")
-- after load
after_load(function (target)