summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-02-11 22:27:38 +0800
committerruki <[email protected]>2019-02-11 08:45:53 +0800
commitb4763becbdab9433f46b96793c64968cc1f34241 (patch)
tree64295ee926c49d4f00e7de28bf1d369d38e58ea7
parentbf9ff509bfc2b41e740d251c46c056e9101da86f (diff)
modify readme
-rw-r--r--README.md9
-rw-r--r--README_zh.md9
-rw-r--r--xmake/core/project/project.lua2
3 files changed, 9 insertions, 11 deletions
diff --git a/README.md b/README.md
index a5e8fc81f..65af85ecb 100644
--- a/README.md
+++ b/README.md
@@ -240,10 +240,11 @@ Download and use remote packages:
```lua
add_requires("libuv master", "ffmpeg", "zlib 1.20.*")
add_requires("tbox >1.6.1", {optional = true, debug = true})
+add_requires("brew::pcre2/libpcre2-8", {alias = "pcre2"})
target("test")
set_kind("shared")
add_files("src/*.c")
- add_packages("libuv", "ffmpeg", "tbox", "zlib")
+ add_packages("libuv", "ffmpeg", "tbox", "zlib", "pcre2")
```
Find and use local packages:
@@ -253,9 +254,7 @@ target("test")
set_kind("shared")
add_files("src/*.c")
on_load(function (target)
- import("lib.detect.find_package")
- target:add(find_package("zlib"))
- target:add(find_package("openssl"))
+ target:add(find_packages("zlib", "openssl", "brew::pcre2/libpcre2-8"))
end)
```
@@ -266,7 +265,7 @@ Some projects using xmake:
* [tbox](https://github.com/tboox/tbox)
* [gbox](https://github.com/tboox/gbox)
* [vm86](https://github.com/tboox/vm86)
-* [more](https://github.com/tboox/awesome-xmake)
+* [more](https://github.com/xmake-io/awesome-xmake)
## Example Video
diff --git a/README_zh.md b/README_zh.md
index 94821c0a5..8b7d84559 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -245,10 +245,11 @@ target("console")
```lua
add_requires("libuv master", "ffmpeg", "zlib 1.20.*")
add_requires("tbox >1.6.1", {optional = true, debug = true})
+add_requires("brew::pcre2/libpcre2-8", {alias = "pcre2"})
target("test")
set_kind("shared")
add_files("src/*.c")
- add_packages("libuv", "ffmpeg", "tbox", "zlib")
+ add_packages("libuv", "ffmpeg", "tbox", "zlib", "pcre2")
```
查找和使用本地已安装的包:
@@ -258,9 +259,7 @@ target("test")
set_kind("shared")
add_files("src/*.c")
on_load(function (target)
- import("lib.detect.find_package")
- target:add(find_package("zlib"))
- target:add(find_package("openssl"))
+ target:add(find_package("zlib", "openssl", "brew::pcre2/libpcre2-8"))
end)
```
@@ -271,7 +270,7 @@ target("test")
* [tbox](https://github.com/tboox/tbox)
* [gbox](https://github.com/tboox/gbox)
* [vm86](https://github.com/tboox/vm86)
-* [更多](https://github.com/tboox/awesome-xmake)
+* [更多](https://github.com/xmake-io/awesome-xmake)
## 演示视频
diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index b4a024d3f..f7b499113 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -585,7 +585,7 @@ function project._load_options(disable_filter)
return nil, errors
end
- -- transform includedirs and links
+ -- transform includedirs and linkdirs
local rootdir = path.directory(packagefile)
for _, packageinfo in pairs(packageinfos) do
local linkdirs = {}