From 6cc070269bd9c3c6e5f341ddad0d606110052790 Mon Sep 17 00:00:00 2001 From: Ced Naru Date: Sat, 12 Oct 2024 08:31:28 +0200 Subject: [PATCH] Fix macos export --- CMakeLists.txt | 2 +- src/gd_kotlin.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55d48c3fa8..c85cca4fca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ add_compile_definitions(DEV_ENABLED) # platforms #add_compile_definitions(WINDOWS_ENABLED) add_compile_definitions(X11_ENABLED) -#add_compile_definitions(OSX_ENABLED) +#add_compile_definitions(MACOS_ENABLED) #add_compile_definitions(IOS_ENABLED) #add_compile_definitions(__ANDROID__) diff --git a/src/gd_kotlin.cpp b/src/gd_kotlin.cpp index 0266896732..bc561a36d4 100644 --- a/src/gd_kotlin.cpp +++ b/src/gd_kotlin.cpp @@ -100,8 +100,10 @@ String GDKotlin::get_path_to_embedded_jvm() { .get_base_dir() #if defined(MACOS_ENABLED) .path_join("../PlugIns/") -#endif + .path_join(String(HOST_EMBEDDED_JRE_DIRECTORY).get_file()) //Only use the last subdir, as the export doesn't keep the relative path +#else .path_join(HOST_EMBEDDED_JRE_DIRECTORY) +#endif .path_join(RELATIVE_JVM_LIB_PATH); }