Skip to content

Commit edc5e18

Browse files
committed
[FIXME]regression: Execute .jar non-functional
Because we moved the lwjgl natives to another location, it could no longer find freetype. This fix is a janky solution. We should really ship freetype itself as they do have a fairly stable ABI. Forge installers breaks without freetype.
1 parent 85670cd commit edc5e18

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

app_pojavlauncher/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ static def getDate() { return new Date().format('yyyyMMdd') }
77
def getVersionName = {
88
// Get the last version tag, as well as the short head of the last commit
99
ByteArrayOutputStream TAG = new ByteArrayOutputStream()
10-
String semVer = "1.1.0"
10+
String semVer = "1.1.1"
1111
// Used by the fallback for github actions
1212
ByteArrayOutputStream TAG_PART_COMMIT = new ByteArrayOutputStream()
1313
String TAG_STRING

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,10 @@ public void launchJavaRuntime(Runtime runtime, File modFile, List<String> javaAr
357357
JREUtils.redirectAndPrintJRELog();
358358
try {
359359
List<String> javaArgList = new ArrayList<>();
360+
// FIXME: Freetype is shipped inside lwjgl. We should ship it outside and use lwjgl native jars instead.
361+
String javaLibraryPath = Tools.lwjglNativesDir + ":" +
362+
Tools.NATIVE_LIB_DIR;
363+
javaArgList.add("-Djava.library.path="+ javaLibraryPath);
360364

361365
// Enable Caciocavallo
362366
Tools.getCacioJavaArgs(javaArgList,runtime.javaVersion == 8, this);

0 commit comments

Comments
 (0)