diff --git a/buildapp/build_app_linux_arm.sh b/buildapp/build_app_linux_arm.sh index 170194218..e7b8b175a 100755 --- a/buildapp/build_app_linux_arm.sh +++ b/buildapp/build_app_linux_arm.sh @@ -25,6 +25,7 @@ chmod +x $DESTDIR/AppRun # Copy over a Java runtime mkdir $DESTDIR/out cp -r "../out/$RUNTIME" $DESTDIR/out/ +mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/Terrarum # Copy over all the assets and a jarfile cp -r "../assets_release" $DESTDIR/ diff --git a/buildapp/build_app_linux_x86.sh b/buildapp/build_app_linux_x86.sh index 75fbb41b2..f56ade280 100755 --- a/buildapp/build_app_linux_x86.sh +++ b/buildapp/build_app_linux_x86.sh @@ -25,6 +25,7 @@ chmod +x $DESTDIR/AppRun # Copy over a Java runtime mkdir $DESTDIR/out cp -r "../out/$RUNTIME" $DESTDIR/out/ +mv $DESTDIR/out/$RUNTIME/bin/java $DESTDIR/out/$RUNTIME/bin/Terrarum # Copy over all the assets and a jarfile cp -r "../assets_release" $DESTDIR/ diff --git a/buildapp/build_app_mac_arm.sh b/buildapp/build_app_mac_arm.sh index 37db5aac0..13e2d7c23 100755 --- a/buildapp/build_app_mac_arm.sh +++ b/buildapp/build_app_mac_arm.sh @@ -27,6 +27,7 @@ chmod +x $DESTDIR/Contents/MacOS/Terrarum.sh # Copy over a Java runtime mkdir $DESTDIR/Contents/MacOS/out cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/ +mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/Terrarum # Copy over all the assets and a jarfile cp -r "../assets_release" $DESTDIR/Contents/MacOS/ diff --git a/buildapp/build_app_mac_x86.sh b/buildapp/build_app_mac_x86.sh index 0daff72b6..f255b604c 100755 --- a/buildapp/build_app_mac_x86.sh +++ b/buildapp/build_app_mac_x86.sh @@ -27,6 +27,7 @@ chmod +x $DESTDIR/Contents/MacOS/Terrarum.sh # Copy over a Java runtime mkdir $DESTDIR/Contents/MacOS/out cp -r "../out/$RUNTIME" $DESTDIR/Contents/MacOS/out/ +mv $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/java $DESTDIR/Contents/MacOS/out/$RUNTIME/bin/Terrarum # Copy over all the assets and a jarfile cp -r "../assets_release" $DESTDIR/Contents/MacOS/ diff --git a/buildapp/build_app_windows_x86.sh b/buildapp/build_app_windows_x86.sh index a7e579bbb..a820f5bc7 100755 --- a/buildapp/build_app_windows_x86.sh +++ b/buildapp/build_app_windows_x86.sh @@ -27,6 +27,7 @@ x86_64-w64-mingw32-gcc -Os -s -o $DESTDIR/Terrarum.exe $SRCFILES/Terrarum.c || { # Copy over a Java runtime mkdir $DESTDIR/out cp -r "../out/$RUNTIME" $DESTDIR/out/ +mv $DESTDIR/out/$RUNTIME/bin/java.exe $DESTDIR/out/$RUNTIME/bin/Terrarum.exe # Copy over all the assets and a jarfile cp -r "../assets_release" $DESTDIR/ diff --git a/buildapp/terrarumlinux_arm/AppRun b/buildapp/terrarumlinux_arm/AppRun index fe33bed94..fb5734fe6 100755 --- a/buildapp/terrarumlinux_arm/AppRun +++ b/buildapp/terrarumlinux_arm/AppRun @@ -1,3 +1,3 @@ #!/bin/bash cd "${0%/*}" -./out/runtime-linux-arm/bin/java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar +./out/runtime-linux-arm/bin/Terrarum -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar diff --git a/buildapp/terrarumlinux_x86/AppRun b/buildapp/terrarumlinux_x86/AppRun index 6d59e7769..31213397f 100755 --- a/buildapp/terrarumlinux_x86/AppRun +++ b/buildapp/terrarumlinux_x86/AppRun @@ -1,3 +1,3 @@ #!/bin/bash cd "${0%/*}" -./out/runtime-linux-x86/bin/java -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar +./out/runtime-linux-x86/bin/Terrarum -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd -jar ./out/TerrarumBuild.jar diff --git a/buildapp/terrarummac_arm/Terrarum.sh b/buildapp/terrarummac_arm/Terrarum.sh index 1a34ab184..2ffa2a311 100755 --- a/buildapp/terrarummac_arm/Terrarum.sh +++ b/buildapp/terrarummac_arm/Terrarum.sh @@ -1,3 +1,3 @@ #!/bin/bash cd "${0%/*}" -./out/runtime-osx-arm/bin/java -jar ./out/TerrarumBuild.jar +./out/runtime-osx-arm/bin/Terrarum -jar ./out/TerrarumBuild.jar diff --git a/buildapp/terrarummac_x86/Terrarum.sh b/buildapp/terrarummac_x86/Terrarum.sh index 83770a025..a3ef72298 100755 --- a/buildapp/terrarummac_x86/Terrarum.sh +++ b/buildapp/terrarummac_x86/Terrarum.sh @@ -1,3 +1,3 @@ #!/bin/bash cd "${0%/*}" -./out/runtime-osx-x86/bin/java -jar ./out/TerrarumBuild.jar +./out/runtime-osx-x86/bin/Terrarum -jar ./out/TerrarumBuild.jar diff --git a/buildapp/terrarumwindows_x86/Terrarum.c b/buildapp/terrarumwindows_x86/Terrarum.c index 41bc168e8..fbe92a0ce 100644 --- a/buildapp/terrarumwindows_x86/Terrarum.c +++ b/buildapp/terrarumwindows_x86/Terrarum.c @@ -2,5 +2,5 @@ #include int main() { - return system(".\\out\\runtime-windows-x86\\bin\\java -jar .\\out\\TerrarumBuild.jar"); + return system(".\\out\\runtime-windows-x86\\bin\\Terrarum.exe -jar .\\out\\TerrarumBuild.jar"); } \ No newline at end of file diff --git a/src/net/torvald/terrarum/Principii.java b/src/net/torvald/terrarum/Principii.java index df14adf8a..73503b968 100644 --- a/src/net/torvald/terrarum/Principii.java +++ b/src/net/torvald/terrarum/Principii.java @@ -87,7 +87,7 @@ public class Principii { extracmd0 += " -Dswing.aatext=true -Dawt.useSystemAAFontSettings=lcd"; } - String runtime = new File("out/"+runtimeRoot+"/bin/java").getAbsolutePath(); + String runtime = new File("out/"+runtimeRoot+"/bin/Terrarum").getAbsolutePath(); // /bin/Terrarum is just a renamed version of /bin/java System.out.println("Runtime path: "+runtime);