Skip to content

Commit b30d3e8

Browse files
committed
rework(continue): Modularize Java sources too
Needed cause of GLFWPreeditCallback and some few others which are new in 3.3.6.
1 parent 9baa89b commit b30d3e8

43 files changed

Lines changed: 14203 additions & 7 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5fe93dfeb05a7e11f80cf312258b35bf447f7750
1+
1f8d98976be6f4119506025a463f064a24162365
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
aabf54536dd5f4ca4caf4add270095a9f946449a
1+
f844aff1a1e7d2d5e3548cca63cde4e2f7d019e4

jre_lwjgl3glfw/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ configurations {
1919
dependencies {
2020
lwjgl333 fileTree(dir: 'libs/lwjgl-3.3.3', include: ['*.jar'])
2121
lwjgl341 fileTree(dir: 'libs/lwjgl-3.4.1', include: ['*.jar'])
22+
lwjgl341 "org.jspecify:jspecify:1.0.0"
2223
}
2324

2425
def lwjglConfigMap = [
@@ -71,6 +72,7 @@ lwjglVersions.each { version ->
7172
}
7273

7374
from {
75+
println ("from block triggered on "+version+" with "+sourceSets.main.java.srcDirs)
7476
sourceSets.main.output
7577
}
7678

@@ -107,6 +109,7 @@ lwjglVersions.each { version ->
107109
}
108110
// Needed to compile with the proper libs
109111
tasks.named('compileJava') {
110-
classpath += lwjglConfigMap[version]
112+
sourceSets.main.java.srcDirs = ["src/main/java/lwjgl-$version"]
113+
classpath = lwjglConfigMap[version]
111114
}
112115
}

jre_lwjgl3glfw/src/main/java/android/util/ArrayMap.java renamed to jre_lwjgl3glfw/src/main/java/lwjgl-3.3.3/android/util/ArrayMap.java

File renamed without changes.

jre_lwjgl3glfw/src/main/java/android/util/ContainerHelpers.java renamed to jre_lwjgl3glfw/src/main/java/lwjgl-3.3.3/android/util/ContainerHelpers.java

File renamed without changes.

jre_lwjgl3glfw/src/main/java/android/util/EmptyArray.java renamed to jre_lwjgl3glfw/src/main/java/lwjgl-3.3.3/android/util/EmptyArray.java

File renamed without changes.

jre_lwjgl3glfw/src/main/java/android/util/MapCollections.java renamed to jre_lwjgl3glfw/src/main/java/lwjgl-3.3.3/android/util/MapCollections.java

File renamed without changes.

jre_lwjgl3glfw/src/main/java/android/util/Objects.java renamed to jre_lwjgl3glfw/src/main/java/lwjgl-3.3.3/android/util/Objects.java

File renamed without changes.

0 commit comments

Comments
 (0)