Update jvm to 11 and start with some holyc++ infra

This commit is contained in:
Willem Cazander 2022-01-31 01:21:39 +01:00
parent 3763ee3fdd
commit 87e11528d7
6 changed files with 30 additions and 7 deletions

View file

@ -6,6 +6,4 @@ Final version will be written in HolyC++ on templeOS.
## Project Setup ## Project Setup
Change demo4d-core to jdk8 to 11 to compile. Use the AdoptOpenJDK(11++) to run the demo.
Use the AdoptOpenJDK to run the demo.

View file

@ -13,6 +13,9 @@ allprojects {
version = '1.0' version = '1.0'
ext { ext {
appName = "demo4d" appName = "demo4d"
appJvmCode = 11
appEncoding = "UTF-8"
x4oVersion = "0.8.6"
gdxVersion = "1.10.0" gdxVersion = "1.10.0"
spairVersion = "1.86.0" spairVersion = "1.86.0"
nativefilechooserVersion = "1.0.0" nativefilechooserVersion = "1.0.0"
@ -42,6 +45,7 @@ project(":desktop") {
project(":core") { project(":core") {
apply plugin: "java-library" apply plugin: "java-library"
dependencies { dependencies {
//api "org.x4o:x4o-driver:$x4oVersion"
api "com.badlogicgames.gdx:gdx:$gdxVersion" api "com.badlogicgames.gdx:gdx:$gdxVersion"
api "io.github.spair:imgui-java-binding:$spairVersion" api "io.github.spair:imgui-java-binding:$spairVersion"
api "io.github.spair:imgui-java-lwjgl3:$spairVersion" api "io.github.spair:imgui-java-lwjgl3:$spairVersion"

View file

@ -1,6 +1,6 @@
sourceCompatibility = 1.7 sourceCompatibility = appJvmCode
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' [compileJava, compileTestJava]*.options*.encoding = appEncoding
sourceSets.main.java.srcDirs = [ "src/" ] sourceSets.main.java.srcDirs = [ "src/", "resources/" ]
eclipse.project.name = appName + "-core" eclipse.project.name = appName + "-core"

View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<modules version="1.0"
xmlns="http://language.x4o.org/xml/ns/modules"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://language.x4o.org/xml/ns/modules http://language.x4o.org/xml/ns/modules-1.0.xsd"
>
<language version="1.0">
<eld-resource>numberxd-lang.eld</eld-resource>
<eld-resource>numberxd-base2t.eld</eld-resource>
</language>
</modules>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<drivers version="1.0"
xmlns="http://language.x4o.org/xml/ns/drivers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd"
>
<defaultDriver language="numberxd"/>
</drivers>

View file

@ -1,4 +1,6 @@
sourceCompatibility = 1.7 sourceCompatibility = appJvmCode
[compileJava, compileTestJava]*.options*.encoding = appEncoding
sourceSets.main.java.srcDirs = [ "src/" ] sourceSets.main.java.srcDirs = [ "src/" ]
sourceSets.main.resources.srcDirs = ["../core/assets"] sourceSets.main.resources.srcDirs = ["../core/assets"]