update

ZFFramework · Jan 19, 2025 · bf85c77 · bf85c77
1 parent 60f8c7d
commit bf85c77
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/ZFLoader/zfproj/Android/ZFLoader/zfapp/CMakeLists.txt b/ZFLoader/zfproj/Android/ZFLoader/zfapp/CMakeLists.txt
@@ -18,10 +18,10 @@ find_library(log-lib log)
 find_library(android-lib android)
 target_link_libraries(ZFLoader ${android-lib} ${log-lib})
 
-target_include_directories(ZFLoader PRIVATE "${PROJECT_SOURCE_DIR}/../../../../zfsrc")
+include_directories("${PROJECT_SOURCE_DIR}/../../../../zfsrc")
 
 function(ZFAddLib ZF_LIB_NAME_)
-    target_include_directories(ZFLoader PRIVATE "${ZF_ROOT_PATH}/_release/Android/all/src/main/cpp/include")
+    include_directories("${ZF_ROOT_PATH}/_release/Android/all/src/main/cpp/include")
     add_library(${ZF_LIB_NAME_} SHARED IMPORTED)
     set_target_properties(${ZF_LIB_NAME_} PROPERTIES IMPORTED_LOCATION "${ZF_ROOT_PATH}/_release/Android/all/src/main/jniLibs/${ANDROID_ABI}/lib${ZF_LIB_NAME_}.so")
     target_link_libraries(ZFLoader ${ZF_LIB_NAME_})

diff --git a/ZFLoader/zfproj/Android/ZFLoader/zfapp/build.gradle b/ZFLoader/zfproj/Android/ZFLoader/zfapp/build.gradle
@@ -68,6 +68,10 @@ dependencies {
     implementation fileTree(dir: ZF_ROOT_PATH + '/_release/Android/module/ZFNet_impl/src/main/libs', includes: ['*.jar'])
 }
 
+if (file(this.projectDir.getAbsolutePath() + '/zfprojConfig.gradle').exists()) {
+    apply from: this.projectDir.getAbsolutePath() + '/zfprojConfig.gradle'
+}
+
 import org.apache.tools.ant.taskdefs.condition.Os
 
 task ZFSetup {

diff --git a/ZFLoader/zfproj_with_src/Android/ZFLoader/zfapp/CMakeLists.txt b/ZFLoader/zfproj_with_src/Android/ZFLoader/zfapp/CMakeLists.txt
@@ -13,7 +13,7 @@ function(ZFAddSrc ZF_SRC_FILES_ PROJ_PATH_)
         )
     set(${ZF_SRC_FILES_} ${${ZF_SRC_FILES_}} ${ZF_SRC_FILES_TMP} PARENT_SCOPE)
 
-    target_include_directories(ZFLoader PRIVATE "${PROJ_PATH_}/zfsrc")
+    include_directories("${PROJ_PATH_}/zfsrc")
 endfunction()
 
 ZFAddSrc(ZF_SRC_FILES ${PROJECT_SOURCE_DIR}/../../../..)

diff --git a/ZFLoader/zfproj_with_src/Android/ZFLoader/zfapp/build.gradle b/ZFLoader/zfproj_with_src/Android/ZFLoader/zfapp/build.gradle
@@ -60,6 +60,31 @@ dependencies {
     implementation fileTree(includes: ['*.jar'], dir: 'libs')
 }
 
+if (file(this.projectDir.getAbsolutePath() + '/zfprojConfig.gradle').exists()) {
+    apply from: this.projectDir.getAbsolutePath() + '/zfprojConfig.gradle'
+}
+if (file(ZF_ROOT_PATH + '/ZF/ZF_impl/zfproj/Android/ZF_impl/zflib/zfprojConfig.gradle').exists()) {
+    apply from: ZF_ROOT_PATH + '/ZF/ZF_impl/zfproj/Android/ZF_impl/zflib/zfprojConfig.gradle'
+}
+if (file(ZF_ROOT_PATH + '/ZF/ZFCore_impl/zfproj/Android/ZFCore_impl/zflib/zfprojConfig.gradle').exists()) {
+    apply from: ZF_ROOT_PATH + '/ZF/ZFCore_impl/zfproj/Android/ZFCore_impl/zflib/zfprojConfig.gradle'
+}
+if (file(ZF_ROOT_PATH + '/ZF/ZFAlgorithm_impl/zfproj/Android/ZFAlgorithm_impl/zflib/zfprojConfig.gradle').exists()) {
+    apply from: ZF_ROOT_PATH + '/ZF/ZFAlgorithm_impl/zfproj/Android/ZFAlgorithm_impl/zflib/zfprojConfig.gradle'
+}
+if (file(ZF_ROOT_PATH + '/ZF/ZFUIKit_impl/zfproj/Android/ZFUIKit_impl/zflib/zfprojConfig.gradle').exists()) {
+    apply from: ZF_ROOT_PATH + '/ZF/ZFUIKit_impl/zfproj/Android/ZFUIKit_impl/zflib/zfprojConfig.gradle'
+}
+if (file(ZF_ROOT_PATH + '/ZF/ZFLua_impl/zfproj/Android/ZFLua_impl/zflib/zfprojConfig.gradle').exists()) {
+    apply from: ZF_ROOT_PATH + '/ZF/ZFLua_impl/zfproj/Android/ZFLua_impl/zflib/zfprojConfig.gradle'
+}
+if (file(ZF_ROOT_PATH + '/ZF/ZFUIWebKit_impl/zfproj/Android/ZFUIWebKit_impl/zflib/zfprojConfig.gradle').exists()) {
+    apply from: ZF_ROOT_PATH + '/ZF/ZFUIWebKit_impl/zfproj/Android/ZFUIWebKit_impl/zflib/zfprojConfig.gradle'
+}
+if (file(ZF_ROOT_PATH + '/ZF/ZFNet_impl/zfproj/Android/ZFNet_impl/zflib/zfprojConfig.gradle').exists()) {
+    apply from: ZF_ROOT_PATH + '/ZF/ZFNet_impl/zfproj/Android/ZFNet_impl/zflib/zfprojConfig.gradle'
+}
+
 import org.apache.tools.ant.taskdefs.condition.Os
 
 task ZFSetup {