konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1.0: fixed natives loading issues with FreeBSD

Browse Source
This commit is contained in:
Evan Debenham
2021-10-16 14:34:00 -04:00
parent 4ee98f2578
commit 740127b89d
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
+11
View File
@@ -26,8 +26,10 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3FileHandle; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3FileHandle;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3NativesLoader;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Preferences; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Preferences;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.GdxNativesLoader;
import com.badlogic.gdx.utils.SharedLibraryLoader; import com.badlogic.gdx.utils.SharedLibraryLoader;
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
@@ -52,6 +54,15 @@ public class DesktopLauncher {
return; return;
} }
//detection for FreeBSD (which is equivalent to linux for us)
//TODO might want to merge request this to libGDX
if (System.getProperty("os.name").contains("FreeBSD")) {
SharedLibraryLoader.isLinux = true;
//this overrides incorrect values set in SharedLibraryLoader's static initializer
SharedLibraryLoader.isIos = false;
SharedLibraryLoader.is64Bit = System.getProperty("os.arch").contains("64") || System.getProperty("os.arch").startsWith("armv8");
}
final String title; final String title;
if (DesktopLauncher.class.getPackage().getSpecificationTitle() == null){ if (DesktopLauncher.class.getPackage().getSpecificationTitle() == null){
title = System.getProperty("Specification-Title"); title = System.getProperty("Specification-Title");