Merge pull request #390 from FunkinCrew/bugfix/github-force-debug

Fix some issues resulting in release builds breaking!

.vscode/settings.json

@@ -180,6 +180,16 @@
       "target": "windows",
       "args": ["-debug", "-DWAVEFORM", "-DFORCE_DEBUG_VERSION"]
     },
+    {
+      "label": "Windows / Release",
+      "target": "windows",
+      "args": ["-release"]
+    },
+    {
+      "label": "Windows / Release (GitHub Actions)",
+      "target": "windows",
+      "args": ["-release", "-DGITHUB_BUILD"]
+    },
     {
       "label": "HashLink / Debug (Waveform Test)",
       "target": "hl",

Project.xml

@@ -91,8 +91,11 @@
 		NOT USING A DIRECT THING TO THE ASSET!!!
 	-->
 	<assets path="assets/fonts" embed="true" />
-	<!-- If compiled via github actions, enable force debug -->
-	<set name="FORCE_DEBUG_VERSION" if="GITHUB_BUILD"/>
+
+	<!-- If compiled via github actions, show debug version number. -->
+	<define name="FORCE_DEBUG_VERSION" if="GITHUB_BUILD" />
+	<define name="NO_REDIRECT_ASSETS_FOLDER" if="GITHUB_BUILD" />
+
 	<!-- _______________________________ Libraries ______________________________ -->
 	<haxelib name="lime" /> <!-- Game engine backend -->
 	<haxelib name="openfl" /> <!-- Game engine backend -->
@@ -216,9 +219,9 @@
 	<postbuild haxe="source/Postbuild.hx"/> -->
 
 	<!-- Enable this on platforms which do not support dropping files onto the window. -->
-	<set name="FILE_DROP_UNSUPPORTED" if="mac" />
+	<haxedef name="FILE_DROP_UNSUPPORTED" if="mac" />
 	<section unless="FILE_DROP_UNSUPPORTED">
-		<set name="FILE_DROP_SUPPORTED" />
+		<haxedef name="FILE_DROP_SUPPORTED" />
 	</section>
 
 	<!-- Options for Polymod -->

source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx

@@ -808,7 +808,8 @@ class ChartEditorDialogHandler
         }
         songVariationMetadataEntry.onClick = onClickMetadataVariation.bind(variation).bind(songVariationMetadataEntryLabel);
         #if FILE_DROP_SUPPORTED
-        addDropHandler(songVariationMetadataEntry, onDropFileMetadataVariation.bind(variation).bind(songVariationMetadataEntryLabel));
+        state.addDropHandler({component: songVariationMetadataEntry, handler: onDropFileMetadataVariation.bind(variation)
+          .bind(songVariationMetadataEntryLabel)});
         #end
         chartContainerB.addComponent(songVariationMetadataEntry);
 
@@ -832,7 +833,11 @@ class ChartEditorDialogHandler
         }
         songVariationChartDataEntry.onClick = onClickChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel);
         #if FILE_DROP_SUPPORTED
-        addDropHandler(songVariationChartDataEntry, onDropFileChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel));
+        state.addDropHandler(
+          {
+            component: songVariationChartDataEntry,
+            handler: onDropFileChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel)
+          });
         #end
         chartContainerB.addComponent(songVariationChartDataEntry);
       }