cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-04-05 19:45:08 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Fix some issues resulting in release builds breaking!
This commit is contained in:
Cameron Taylor 2024-03-14 06:09:48 -04:00 committed by GitHub
parent 371f33d102 c4550ca773
commit 4c35b1d74f
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.vscode/settings.json vendored
View file

@ -180,6 +180,16 @@
"target": "windows", "target": "windows",
"args": ["-debug", "-DWAVEFORM", "-DFORCE_DEBUG_VERSION"] "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)", "label": "HashLink / Debug (Waveform Test)",
"target": "hl", "target": "hl",

11
Project.xml
View file

@ -91,8 +91,11 @@
NOT USING A DIRECT THING TO THE ASSET!!! NOT USING A DIRECT THING TO THE ASSET!!!
--> -->
<assets path="assets/fonts" embed="true" /> <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 ______________________________ --> <!-- _______________________________ Libraries ______________________________ -->
<haxelib name="lime" /> <!-- Game engine backend --> <haxelib name="lime" /> <!-- Game engine backend -->
<haxelib name="openfl" /> <!-- Game engine backend --> <haxelib name="openfl" /> <!-- Game engine backend -->
@ -216,9 +219,9 @@
<postbuild haxe="source/Postbuild.hx"/> --> <postbuild haxe="source/Postbuild.hx"/> -->
<!-- Enable this on platforms which do not support dropping files onto the window. --> <!-- 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"> <section unless="FILE_DROP_UNSUPPORTED">
<set name="FILE_DROP_SUPPORTED" /> <haxedef name="FILE_DROP_SUPPORTED" />
</section> </section>
<!-- Options for Polymod --> <!-- Options for Polymod -->

2
assets

@ -1 +1 @@
Subproject commit f7174199004f77eef8eaecfa81cd9307fe020699 Subproject commit 0e2c5bf2134c7e517b70cf74afd58abe5c7b5e50

9
source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
View file

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