Merge pull request #28 from Ktar5/master

2025-02-22 12:38:05 +07:00 · 2017-12-21 19:20:52 -05:00 · 2017-12-21 19:20:52 -05:00 · 5505f4790c
commit 5505f4790c
parent 5db8be436a 8f929bae23
2 changed files with 10 additions and 1 deletions
--- a/build.gradle
+++ b/build.gradle
@ -80,7 +80,11 @@ project(":core") {
    apply plugin: "java"

    dependencies {
-        compile 'com.github.anuken:ucore:7938cb4bf9'
+        if(new File('../uCore-master').exists()){
+            compile project(":uCore")
+        }else{
+            compile 'com.github.anuken:ucore:7938cb4bf9'
+        }
        compile "com.badlogicgames.gdx:gdx:$gdxVersion"
        compile "com.badlogicgames.gdx:gdx-ai:1.8.1"
    }
--- a/settings.gradle
+++ b/settings.gradle
@ -1 +1,6 @@
 include 'desktop', 'html', 'core', 'android'
+
+if (new File(settingsDir, '../uCore-master').exists()) {
+    include ':uCore'
+    project(':uCore').projectDir = new File(settingsDir, '../uCore-master')
+}