diff --git a/README.md b/README.md index 1b0e661..4581727 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ XMake installed on the system. Available [here](https://github.com/xmake-io/xmak ``` plugins { - id 'org.tboox.gradle-xmake-plugin' version '1.0.7' + id 'org.tboox.gradle-xmake-plugin' version '1.0.8' } ``` @@ -70,7 +70,7 @@ buildscript { } } dependencies { - classpath 'org.tboox:gradle-xmake-plugin:1.0.7' + classpath 'org.tboox:gradle-xmake-plugin:1.0.8' } repositories { mavenCentral() diff --git a/README_zh.md b/README_zh.md index 4d57a76..eacbc6b 100644 --- a/README_zh.md +++ b/README_zh.md @@ -56,7 +56,7 @@ xmake-gradle是一个无缝整合xmake的gradle插件。 ``` plugins { - id 'org.tboox.gradle-xmake-plugin' version '1.0.7' + id 'org.tboox.gradle-xmake-plugin' version '1.0.8' } ``` @@ -70,7 +70,7 @@ buildscript { } } dependencies { - classpath 'org.tboox:gradle-xmake-plugin:1.0.7' + classpath 'org.tboox:gradle-xmake-plugin:1.0.8' } repositories { mavenCentral() diff --git a/gradle-xmake-plugin/build.gradle b/gradle-xmake-plugin/build.gradle index 76644f5..96e6bd6 100644 --- a/gradle-xmake-plugin/build.gradle +++ b/gradle-xmake-plugin/build.gradle @@ -8,7 +8,7 @@ plugins { apply plugin: 'groovy' group = "org.tboox" -version = "1.0.7" +version = "1.0.8" repositories { // Use jcenter for resolving your dependencies. diff --git a/gradle-xmake-plugin/src/main/resources/lua/install_artifacts.lua b/gradle-xmake-plugin/src/main/resources/lua/install_artifacts.lua index 3137af1..b7232ae 100644 --- a/gradle-xmake-plugin/src/main/resources/lua/install_artifacts.lua +++ b/gradle-xmake-plugin/src/main/resources/lua/install_artifacts.lua @@ -68,7 +68,7 @@ function _install_cxxstl(installdir, arch) -- get c++ sdk directory local cxxstl_sdkdir - if ndk_cxxstl:startswith("llvmstl") then + if ndk_cxxstl:startswith("c++") or ndk_cxxstl:startswith("llvmstl") then cxxstl_sdkdir = cxxstl_sdkdir_llvmstl elseif ndk_cxxstl:startswith("gnustl") then cxxstl_sdkdir = cxxstl_sdkdir_gnustl @@ -94,7 +94,7 @@ function _install_cxxstl(installdir, arch) -- get stl library local cxxstl_filename - if ndk_cxxstl == "llvmstl_shared" then + if ndk_cxxstl == "c++_shared" or ndk_cxxstl == "llvmstl_shared" then cxxstl_filename = "libc++_shared.so" elseif ndk_cxxstl == "gnustl_shared" then cxxstl_filename = "libgnustl_shared.so" diff --git a/nativelib/build.gradle b/nativelib/build.gradle index 6cc5dcd..2eac4c0 100644 --- a/nativelib/build.gradle +++ b/nativelib/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.tboox.gradle-xmake-plugin' version '1.0.7' + id 'org.tboox.gradle-xmake-plugin' version '1.0.8' } apply plugin: 'com.android.library'