AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 23:10:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to use GL 3.0 when possible

Browse Source
This commit is contained in:
Yair Morgenstern 2019-11-25 06:34:02 +02:00
parent 4277ba5c8f
commit 3fad0985b4
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 29 targetSdkVersion 29
versionCode 329 versionCode 330
versionName "3.3.0-patch1" versionName "3.3.1"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

9
desktop/build.gradle
View File

@ -27,7 +27,7 @@ task debug(dependsOn: classes, type: JavaExec) {
debug = true debug = true
} }
task dist(dependsOn: classes, type: Jar) { task dist(dependsOn: classes, type: Jar) { // Compiles the jar file
from files(sourceSets.main.output.resourcesDir) from files(sourceSets.main.output.resourcesDir)
from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.classesDirs)
// see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491 // see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491
@ -49,8 +49,7 @@ for(platform in PackrConfig.Platform.values()) {
def jarFile = "desktop/build/libs/${appName}.jar".toString() def jarFile = "desktop/build/libs/${appName}.jar".toString()
PackrConfig config = new PackrConfig() PackrConfig config = new PackrConfig()
config.platform = platform config.platform = platform
config.jdk = System.env.'JAVA_HOME' config.jdk = System.env.'JAVA_HOME' // For Travis
// 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"
// config.jdk = "C:/Users/LENOVO/Downloads/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip" // config.jdk = "C:/Users/LENOVO/Downloads/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip"
config.executable = "Unciv" config.executable = "Unciv"
config.classpath = Arrays.asList(jarFile) config.classpath = Arrays.asList(jarFile)
@ -78,10 +77,6 @@ for(platform in PackrConfig.Platform.values()) {
} }
task packr(){ task packr(){
// finalizedBy "packrWindows64"
// doFirst{
// delete(file("packrCache"))
// }
for(platform in PackrConfig.Platform.values()) for(platform in PackrConfig.Platform.values())
finalizedBy "packr${platform.toString()}" finalizedBy "packr${platform.toString()}"
} }

1
desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
View File

@ -20,6 +20,7 @@ internal object DesktopLauncher {
packImages() packImages()
val config = LwjglApplicationConfiguration() val config = LwjglApplicationConfiguration()
config.useGL30 = true
config.addIcon("ExtraImages/Icon.png", Files.FileType.Internal) config.addIcon("ExtraImages/Icon.png", Files.FileType.Internal)
config.title = "Unciv" config.title = "Unciv"