diff --git a/README.md b/README.md index 7579923b..e6df6aa6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,4 @@ Final version will be written in HolyC++ on templeOS. ## Project Setup -Change demo4d-core to jdk8 to 11 to compile. - -Use the AdoptOpenJDK to run the demo. +Use the AdoptOpenJDK(11++) to run the demo. diff --git a/build.gradle b/build.gradle index 380ede97..8c7582db 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,9 @@ allprojects { version = '1.0' ext { appName = "demo4d" + appJvmCode = 11 + appEncoding = "UTF-8" + x4oVersion = "0.8.6" gdxVersion = "1.10.0" spairVersion = "1.86.0" nativefilechooserVersion = "1.0.0" @@ -42,6 +45,7 @@ project(":desktop") { project(":core") { apply plugin: "java-library" dependencies { + //api "org.x4o:x4o-driver:$x4oVersion" api "com.badlogicgames.gdx:gdx:$gdxVersion" api "io.github.spair:imgui-java-binding:$spairVersion" api "io.github.spair:imgui-java-lwjgl3:$spairVersion" diff --git a/core/build.gradle b/core/build.gradle index d192d041..d1edc0c4 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,6 +1,6 @@ -sourceCompatibility = 1.7 -[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' +sourceCompatibility = appJvmCode +[compileJava, compileTestJava]*.options*.encoding = appEncoding -sourceSets.main.java.srcDirs = [ "src/" ] +sourceSets.main.java.srcDirs = [ "src/", "resources/" ] eclipse.project.name = appName + "-core" diff --git a/core/resources/META-INF/numberxd/numberxd-modules.xml b/core/resources/META-INF/numberxd/numberxd-modules.xml new file mode 100644 index 00000000..d551d9a4 --- /dev/null +++ b/core/resources/META-INF/numberxd/numberxd-modules.xml @@ -0,0 +1,11 @@ + + + + numberxd-lang.eld + numberxd-base2t.eld + + diff --git a/core/resources/META-INF/x4o-drivers.xml b/core/resources/META-INF/x4o-drivers.xml new file mode 100644 index 00000000..3b2b9294 --- /dev/null +++ b/core/resources/META-INF/x4o-drivers.xml @@ -0,0 +1,8 @@ + + + + diff --git a/desktop/build.gradle b/desktop/build.gradle index 1679a532..a88ecc95 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -1,4 +1,6 @@ -sourceCompatibility = 1.7 +sourceCompatibility = appJvmCode +[compileJava, compileTestJava]*.options*.encoding = appEncoding + sourceSets.main.java.srcDirs = [ "src/" ] sourceSets.main.resources.srcDirs = ["../core/assets"]