fix merge conflict + add to hxp

FunkinCrew · Sep 28, 2024 · 28d1686 · 28d1686
1 parent 83ccc34
commit 28d1686
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/project.hxp b/project.hxp
@@ -245,6 +245,7 @@ class Project extends HXProject {
     configureHaxelibs();
     configureAssets();
     configureIcons();
+		configureAL();
 	}
 
 	/**
@@ -705,6 +706,15 @@ class Project extends HXProject {
 		addIcon("art/iconOG.png");
   }
 
+	/**
+	 * For desktop platforms, copy the OpenALSoft config file into the build to improve audio quality.
+	 */
+	function configureAL() {
+		if (isDesktop()) {
+			addAsset("alsoft.txt", 'plugins/alsoft.${isWindows() ? "ini" : "conf"}', "default", false);
+		}
+	}
+
 	//
 	// HELPER FUNCTIONS
 	// Easy functions to make the code more readable.

diff --git a/source/funkin/audio/ALConfig.hx b/source/funkin/audio/ALConfig.hx
@@ -13,7 +13,7 @@ class ALConfig
     configPath += "/plugins/alsoft.ini";
     #elseif mac
     configPath = Path.directory(configPath) + "/Resources/plugins/alsoft.conf";
-    #elseif linux
+    #else
     configPath += "/plugins/alsoft.conf";
     #end