Merge pull request #438 from time-killer-games/feature/tabs-cross-platform

Linux is case-sensitive for filesystem paths.

Author: OctoFlareDev

extensions/libfiledialogs/libfiledialogs.dll

@@ -4,6 +4,7 @@
 		EnvironmentSetVariable("IMGUI_FONT_PATH", working_directory + string_lower("Fonts"));
 		_IfdLoadFonts();
 	} else {
+		EnvironmentSetVariable("IMGUI_FONT_PATH", program_directory + "assets/" + string_lower("Fonts"));
 		pid = ProcessExecute("uname -m");
 		res = ExecutedProcessReadFromStandardOutput(pid);
 		FreeExecutedProcessStandardOutput(pid);

extensions/libfiledialogs/libfiledialogs.dylib

@@ -13,23 +13,23 @@ if (os_type != os_windows) {
 // Use light theme to match default UI theme of OpenNBS:
 EnvironmentSetVariable("IMGUI_DIALOG_THEME", string(1));
 EnvironmentSetVariable("IMGUI_DIALOG_NOBORDER", string(1));
-
-function evaluate_command(prog, arg) {
-  prog = string_replace_all(prog, @'\', @'\\');
-  prog = string_replace_all(prog, @'"', @'\"');
-  if (os_type == os_windows && 
-    (string_lower(filename_name(prog)) == "cmd" ||
-    string_lower(filename_name(prog)) == "cmd.exe")) 
-  { prog = "cmd.exe"; arg = "/c " + arg; } 
-  prog = @'"' + prog + @'"'; var pre = "";
-  if (os_type == os_windows) pre = "cmd /c";
-  var pid = ProcessExecute(pre + " " + prog + " " + arg);
-  var out = ExecutedProcessReadFromStandardOutput(pid);
-  FreeExecutedProcessStandardInput(pid);
-  FreeExecutedProcessStandardOutput(pid);
-  return out;
+
+function evaluate_command(prog, arg) {
+  prog = string_replace_all(prog, @'\', @'\\');
+  prog = string_replace_all(prog, @'"', @'\"');
+  if (os_type == os_windows && 
+    (string_lower(filename_name(prog)) == "cmd" ||
+    string_lower(filename_name(prog)) == "cmd.exe")) 
+  { prog = "cmd.exe"; arg = "/c " + arg; } 
+  prog = @'"' + prog + @'"'; var pre = "";
+  if (os_type == os_windows) pre = "cmd /c";
+  var pid = ProcessExecute(pre + " " + prog + " " + arg);
+  var out = ExecutedProcessReadFromStandardOutput(pid);
+  FreeExecutedProcessStandardInput(pid);
+  FreeExecutedProcessStandardOutput(pid);
+  return out;
 }
-
+
 // Start OpenNBS Maximized (macOS):
 if (os_type == os_macosx) {
   // Maxmize window on startup
@@ -41,16 +41,8 @@ if (os_type == os_linux) {
   var pid = 0;
   // Maxmize window on startup
   if (evaluate_command("uname", "-m") == "x86_64\n") external_call(external_define(current_directory + "libzoom.so", "window_zoom", dll_cdecl, ty_real, 1, ty_string), window_handle());
-  else if (evaluate_command("uname", "-m") == "aarch64\n") external_call(external_define(current_directory + "libzoom_arm64.so", "window_zoom", dll_cdecl, ty_real, 1, ty_string), window_handle());
-  else if (evaluate_command("uname", "-m") == "armv7l\n") external_call(external_define(current_directory + "libzoom_arm.so", "window_zoom", dll_cdecl, ty_real, 1, ty_string), window_handle());
-  if (evaluate_command("uname", "-m") == "aarch64\n" || evaluate_command("uname", "-m") == "armv7l\n") {
-    // The Raspberry Pi and similar ARM devices can't handle combining tons of font files like we're doing
-	// on x86 platforms, use English-only; it's better than having no fonts displaying correctly at all...
-    execute_program("cp", "-fR \"" + current_directory + "/fonts\" \"" + file_directory + "/\"", true);
-	directory_create(file_directory + "/fonts/arm/");
-    execute_program("mv", "-f \"" + file_directory + "/fonts/000-notosans-regular.ttf\" \"" + file_directory + "/fonts/arm/000-notosans-regular.ttf\"", true);
-    EnvironmentSetVariable("IMGUI_FONT_PATH", file_directory + "/fonts/arm/");
-  }
+  else if (evaluate_command("uname", "-m") == "aarch64\n") external_call(external_define(current_directory + "libzoom_arm64.so", "window_zoom", dll_cdecl, ty_real, 1, ty_string), window_handle());
+  else if (evaluate_command("uname", "-m") == "armv7l\n") external_call(external_define(current_directory + "libzoom_arm.so", "window_zoom", dll_cdecl, ty_real, 1, ty_string), window_handle());
   // Ignore this pls:
   _DialogInitialize();
   // Compensate for weird bug I don't know how to fix, with lowercase being forced calling file_copy(); it makes no sense:

extensions/libfiledialogs/libfiledialogs.gml

@@ -232,31 +232,31 @@ function control_create() {
 	str = ""
 	soundinvoke = create(obj_instrument)
 	soundinvoke.key = 45
-	soundinvoke.filename = "UI/invoke.ogg"
+	soundinvoke.filename = "ui/invoke.ogg"
 	soundinvoke.user = 0
 	soundshow =   create(obj_instrument)
 	soundshow.key =   45
-	soundshow.filename =     "UI/show.ogg"
+	soundshow.filename =     "ui/show.ogg"
 	soundshow.user =   0
 	soundhide =   create(obj_instrument)
 	soundhide.key =   45
-	soundhide.filename =     "UI/hide.ogg"
+	soundhide.filename =     "ui/hide.ogg"
 	soundhide.user =   0
 	soundgoback = create(obj_instrument)
 	soundgoback.key = 45
-	soundgoback.filename = "UI/goback.ogg"
+	soundgoback.filename = "ui/goback.ogg"
 	soundgoback.user = 0
 	soundmetronome = create(obj_instrument)
 	soundmetronome.key = 45
-	soundmetronome.filename = "UI/metronome.ogg"
+	soundmetronome.filename = "ui/metronome.ogg"
 	soundmetronome.user = 0
 	soundding = create(obj_instrument)
 	soundding.key = 45
-	soundding.filename = "UI/ding.ogg"
+	soundding.filename = "ui/ding.ogg"
 	soundding.user = 0
 	soundmetronomeclick = create(obj_instrument)
 	soundmetronomeclick.key = 45
-	soundmetronomeclick.filename = "UI/metronome_click.ogg"
+	soundmetronomeclick.filename = "ui/metronome_click.ogg"
 	soundmetronomeclick.user = 0
 
 	first_custom_index = array_length(original_instruments)

extensions/libfiledialogs/libfiledialogs.so

@@ -1,8 +1,8 @@
 function instrument_load() {
 	// instrument_load()
 
-	var fn = sounds_directory + filename;
-	if (os_type = os_windows) fn = string_replace_all(fn, "/", "\\");
+	var fn = bundled_sounds_directory + filename;
+	if (os_type = os_windows) fn = string_replace_all(fn, "/", "\\")
 
 	log("Load instrument", fn)