diff options
| author | ruki <[email protected]> | 2018-04-15 22:36:32 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-04-15 22:36:32 +0800 |
| commit | 05f1e2189edb9cdab244a19f170bbccf1938c90e (patch) | |
| tree | 0317582eece6abd54a516235dade6d192095a39f | |
| parent | acee17158d13b1779d9be23b42e8ce2e72e60746 (diff) | |
add qt shared rules
| -rw-r--r-- | xmake/rules/qt/console/load.lua | 3 | ||||
| -rw-r--r-- | xmake/rules/qt/shared/load.lua | 3 | ||||
| -rw-r--r-- | xmake/rules/qt/static/load.lua | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/xmake/rules/qt/console/load.lua b/xmake/rules/qt/console/load.lua index 0976d2ed4..4185132e0 100644 --- a/xmake/rules/qt/console/load.lua +++ b/xmake/rules/qt/console/load.lua @@ -56,11 +56,12 @@ function main(target) -- deprecated API in order to know how to port your code away from it. target:add("defines", "QT_DEPRECATED_WARNINGS") - -- add frameworks + -- add includedirs, linkdirs for macosx if is_plat("macosx") then target:add("frameworkdirs", qt.linkdirs) target:add("frameworks", "QtCore", "DiskArbitration", "IOKit") target:add("includedirs", path.join(qt.sdkdir, "lib/QtCore.framework/Headers")) + target:add("includedirs", path.join(qt.sdkdir, "mkspecs/macx-clang")) target:add("rpathdirs", "@executable_path/Frameworks", qt.linkdirs) end end diff --git a/xmake/rules/qt/shared/load.lua b/xmake/rules/qt/shared/load.lua index 821c4b981..6baf7050b 100644 --- a/xmake/rules/qt/shared/load.lua +++ b/xmake/rules/qt/shared/load.lua @@ -56,11 +56,12 @@ function main(target) -- deprecated API in order to know how to port your code away from it. target:add("defines", "QT_DEPRECATED_WARNINGS") - -- add frameworks + -- add includedirs and linkdirs for macosx if is_plat("macosx") then target:add("frameworkdirs", qt.linkdirs) target:add("frameworks", "QtCore", "DiskArbitration", "IOKit") target:add("includedirs", path.join(qt.sdkdir, "lib/QtCore.framework/Headers")) + target:add("includedirs", path.join(qt.sdkdir, "mkspecs/macx-clang")) target:add("rpathdirs", "@executable_path/Frameworks", qt.linkdirs) end end diff --git a/xmake/rules/qt/static/load.lua b/xmake/rules/qt/static/load.lua index 0d1ca8d54..51af12bd3 100644 --- a/xmake/rules/qt/static/load.lua +++ b/xmake/rules/qt/static/load.lua @@ -56,11 +56,12 @@ function main(target) -- deprecated API in order to know how to port your code away from it. target:add("defines", "QT_DEPRECATED_WARNINGS") - -- add frameworks + -- add includedirs for macosx if is_plat("macosx") then target:add("frameworkdirs", qt.linkdirs) target:add("frameworks", "OpenGL", "AGL") target:add("includedirs", path.join(qt.sdkdir, "lib/QtGui.framework/Headers")) target:add("includedirs", path.join(qt.sdkdir, "lib/QtCore.framework/Headers")) + target:add("includedirs", path.join(qt.sdkdir, "mkspecs/macx-clang")) end end |