Skip to content

Commit 3fad098

Browse files
committed
Attempt to use GL 3.0 when possible
1 parent 4277ba5 commit 3fad098

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android {
2121
applicationId "com.unciv.app"
2222
minSdkVersion 14
2323
targetSdkVersion 29
24-
versionCode 329
25-
versionName "3.3.0-patch1"
24+
versionCode 330
25+
versionName "3.3.1"
2626
}
2727

2828
// Had to add this crap for Travis to build, it wanted to sign the app

desktop/build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ task debug(dependsOn: classes, type: JavaExec) {
2727
debug = true
2828
}
2929

30-
task dist(dependsOn: classes, type: Jar) {
30+
task dist(dependsOn: classes, type: Jar) { // Compiles the jar file
3131
from files(sourceSets.main.output.resourcesDir)
3232
from files(sourceSets.main.output.classesDirs)
3333
// see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491
@@ -49,8 +49,7 @@ for(platform in PackrConfig.Platform.values()) {
4949
def jarFile = "desktop/build/libs/${appName}.jar".toString()
5050
PackrConfig config = new PackrConfig()
5151
config.platform = platform
52-
config.jdk = System.env.'JAVA_HOME'
53-
// config.jdk = "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip"
52+
config.jdk = System.env.'JAVA_HOME' // For Travis
5453
// config.jdk = "C:/Users/LENOVO/Downloads/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip"
5554
config.executable = "Unciv"
5655
config.classpath = Arrays.asList(jarFile)
@@ -78,10 +77,6 @@ for(platform in PackrConfig.Platform.values()) {
7877
}
7978

8079
task packr(){
81-
// finalizedBy "packrWindows64"
82-
// doFirst{
83-
// delete(file("packrCache"))
84-
// }
8580
for(platform in PackrConfig.Platform.values())
8681
finalizedBy "packr${platform.toString()}"
8782
}

desktop/src/com/unciv/app/desktop/DesktopLauncher.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ internal object DesktopLauncher {
2020
packImages()
2121

2222
val config = LwjglApplicationConfiguration()
23+
config.useGL30 = true
2324
config.addIcon("ExtraImages/Icon.png", Files.FileType.Internal)
2425
config.title = "Unciv"
2526

0 commit comments

Comments
 (0)