diff --git a/README.md b/README.md index dafd1a6..4600baf 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.1.0' + id 'org.tboox.gradle-xmake-plugin' version '1.1.2' } ``` @@ -70,7 +70,7 @@ buildscript { } } dependencies { - classpath 'org.tboox:gradle-xmake-plugin:1.1.0' + classpath 'org.tboox:gradle-xmake-plugin:1.1.2' } repositories { mavenCentral() diff --git a/README_zh.md b/README_zh.md index a87e10f..a397d98 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.1.0' + id 'org.tboox.gradle-xmake-plugin' version '1.1.2' } ``` @@ -70,7 +70,7 @@ buildscript { } } dependencies { - classpath 'org.tboox:gradle-xmake-plugin:1.1.0' + classpath 'org.tboox:gradle-xmake-plugin:1.1.2' } repositories { mavenCentral() diff --git a/gradle-xmake-plugin/build.gradle b/gradle-xmake-plugin/build.gradle index 12d744b..493a4be 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.1.0" +version = "1.1.2" repositories { // Use jcenter for resolving your dependencies. diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeConfigureTask.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeConfigureTask.groovy index 3b807dd..346938b 100644 --- a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeConfigureTask.groovy +++ b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeConfigureTask.groovy @@ -40,6 +40,7 @@ class XMakeConfigureTask extends DefaultTask { List parameters = new ArrayList<>(); parameters.add(taskContext.program) parameters.add("f") + parameters.add("-c") parameters.add("-y") switch (taskContext.logLevel) { case "verbose": diff --git a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeTaskContext.groovy b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeTaskContext.groovy index 7d9cc56..a3dc34d 100644 --- a/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeTaskContext.groovy +++ b/gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeTaskContext.groovy @@ -129,13 +129,7 @@ class XMakeTaskContext { // get c++ stl library String getStl() { - String stl = extension.stl - if (stl == "c++_static") { - stl = "llvmstl_static" - } else if (stl == "c++_shared") { - stl = "llvmstl_shared" - } - return stl + return extension.stl } // get project directory @@ -220,4 +214,4 @@ class XMakeTaskContext { String getBuildMode() { return extension.buildMode } -} \ No newline at end of file +} 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 b7232ae..325dab3 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("c++") or ndk_cxxstl:startswith("llvmstl") then + if ndk_cxxstl:startswith("c++") 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 == "c++_shared" or ndk_cxxstl == "llvmstl_shared" then + if ndk_cxxstl == "c++_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 81abeab..ea3ed88 100644 --- a/nativelib/build.gradle +++ b/nativelib/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.tboox.gradle-xmake-plugin' version '1.1.0' + id 'org.tboox.gradle-xmake-plugin' version '1.1.2' } apply plugin: 'com.android.library' //apply plugin: "org.tboox.gradle-xmake-plugin" @@ -52,11 +52,11 @@ android { }*/ xmake { - logLevel "verbose" + //logLevel "verbose" path "jni/xmake.lua" buildMode "debug" //program /usr/local/bin/xmake - //stl "c++_shared" + stl "c++_shared" //stdcxx false //ndk "/Users/ruki/files/android-ndk-r20b/" //sdkver 21