diff --git a/app/build.gradle b/app/build.gradle index 23e7000..818fbcd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,9 +26,9 @@ android { targets 'cocos2djs' arguments 'NDK_TOOLCHAIN_VERSION=clang' - def module_paths = [project.file("/Users/zhl/Documents/workspace/cocos/cocos2d-x"), - project.file("/Users/zhl/Documents/workspace/cocos/cocos2d-x/cocos"), - project.file("/Users/zhl/Documents/workspace/cocos/cocos2d-x/external")] + def module_paths = [project.file(rootProject.ext.cfgs.cocos2dxBasePath), + project.file(rootProject.ext.cfgs.cocos2dxBasePath+"/cocos"), + project.file(rootProject.ext.cfgs.cocos2dxBasePath+"/external")] if (Os.isFamily(Os.FAMILY_WINDOWS)) { arguments 'NDK_MODULE_PATH=' + module_paths.join(";") } @@ -46,7 +46,7 @@ android { sourceSets.main { java.srcDirs "../src", "src" res.srcDirs "../res", 'res' - jniLibs.srcDirs "../libs", 'libs', '/Users/zhl/Documents/workspace/unity/first/android/first/src/main/jniLibs' + jniLibs.srcDirs "../libs", 'libs', rootProject.ext.cfgs.unityAndroidProject + '/src/main/jniLibs' manifest.srcFile "AndroidManifest.xml" } @@ -77,14 +77,14 @@ android.applicationVariants.all { variant -> delete "${buildDir}/intermediates/merged_assets/${variant.dirName}" variant.mergeAssets.doLast { - def sourceDir = "/Users/zhl/Documents/workspace/android/HeadlessCocos" + def sourceDir = rootProject.ext.cfgs.jsFilePath copy{ from "${sourceDir}" include "js/**" into outputDir } - def sourceDirUnity = "/Users/zhl/Documents/workspace/unity/first/android/first/src/main/assets/" + def sourceDirUnity = rootProject.ext.cfgs.unityAndroidProject + "/src/main/assets/" copy { from "${sourceDirUnity}" @@ -104,7 +104,7 @@ dependencies { implementation fileTree(dir: '../libs', include: ['*.jar','*.aar']) implementation fileTree(dir: 'libs', include: ['*.jar','*.aar']) - implementation fileTree(dir: "/Users/zhl/Documents/workspace/cocos/cocos2d-x/cocos/platform/android/java/libs", include: ['*.jar']) + implementation fileTree(dir: rootProject.ext.cfgs.cocos2dxBasePath + "/cocos/platform/android/java/libs", include: ['*.jar']) implementation project(':libcocos2dx') implementation "androidx.appcompat:appcompat:1.0.2" diff --git a/build-cfg.json b/build-cfg.json deleted file mode 100644 index b99bab4..0000000 --- a/build-cfg.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "ndk_module_path" :[ - "/Users/zhl/Documents/workspace/cocos/cocos2d-x", - "/Users/zhl/Documents/workspace/cocos/cocos2d-x/cocos", - "/Users/zhl/Documents/workspace/cocos/cocos2d-x/external" - ], - "copy_resources": [] -} diff --git a/build.gradle b/build.gradle index 2205626..1746a3d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. +apply from: "config.gradle" buildscript { repositories { google() diff --git a/config.gradle b/config.gradle new file mode 100644 index 0000000..d361f6b --- /dev/null +++ b/config.gradle @@ -0,0 +1,10 @@ +ext{ + cfgs = [ + // 自定义的cocos2d-x项目根路径 + cocos2dxBasePath: '/Users/zhl/Documents/workspace/cocos/cocos2d-x', + // js钱包项目路径 + jsFilePath: '/Users/zhl/Documents/workspace/android/HeadlessCocos', + // unity export的android项目的根路径 + unityAndroidProject: '/Users/zhl/Documents/workspace/unity/first/android/first' + ] +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d46beef..8ca853b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,5 @@ +apply from: "config.gradle" include ':app' rootProject.name = "HeadlessCocos" include ':libcocos2dx' -project(':libcocos2dx').projectDir = new File('/Users/zhl/Documents/workspace/cocos/cocos2d-x/cocos/platform/android/libcocos2dx') +project(':libcocos2dx').projectDir = new File(ext.cfgs.cocos2dxBasePath + '/cocos/platform/android/libcocos2dx')