djFlixel because it's cool

Joalor64GH · Aug 20, 2023 · 2b5145a · 2b5145a
1 parent 89de559
commit 2b5145a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -38,6 +38,7 @@ jobs:
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons.git dev
           haxelib install hxCodec 2.5.1
           haxelib install swf 3.2.0
+          haxelib git djFlixel https://github.com/john32b/djFlixel
           haxelib git polymod-joalor64 https://github.com/Joalor64GH/polymod-joalor64
           haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
@@ -83,6 +84,7 @@ jobs:
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons.git dev
           haxelib install hxCodec 2.5.1
           haxelib install swf 3.2.0
+          haxelib git djFlixel https://github.com/john32b/djFlixel
           haxelib git polymod-joalor64 https://github.com/Joalor64GH/polymod-joalor64
           haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
@@ -129,6 +131,7 @@ jobs:
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons.git dev
           haxelib install hxCodec 2.5.1
           haxelib install swf 3.2.0
+          haxelib git djFlixel https://github.com/john32b/djFlixel
           haxelib git polymod-joalor64 https://github.com/Joalor64GH/polymod-joalor64
           haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,6 +38,7 @@ jobs:
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons.git dev
           haxelib install hxCodec 2.5.1
           haxelib install swf 3.2.0
+          haxelib git djFlixel https://github.com/john32b/djFlixel
           haxelib git polymod-joalor64 https://github.com/Joalor64GH/polymod-joalor64
           haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
@@ -83,6 +84,7 @@ jobs:
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons.git dev
           haxelib install hxCodec 2.5.1
           haxelib install swf 3.2.0
+          haxelib git djFlixel https://github.com/john32b/djFlixel
           haxelib git polymod-joalor64 https://github.com/Joalor64GH/polymod-joalor64
           haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
@@ -129,6 +131,7 @@ jobs:
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons.git dev
           haxelib install hxCodec 2.5.1
           haxelib install swf 3.2.0
+          haxelib git djFlixel https://github.com/john32b/djFlixel
           haxelib git polymod-joalor64 https://github.com/Joalor64GH/polymod-joalor64
           haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools
           haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit

diff --git a/Project.xml b/Project.xml
@@ -2,19 +2,25 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<!-- Main Stuff -->
-	<app title="Friday Night Funkin': Joalor64 Engine Rewritten" package="com.joalor64gh.j64enginere" main="Main" version="0.2.8" company="Joalor64GH" />
+	<!-- Application Window Title and Executable File Name -->
+	<app title="Friday Night Funkin': Joalor64 Engine Rewritten" />
 	<app file="J64EngineRE_WIN" if="windows" />
 	<app file="J64EngineRE_APP" if="linux" />
 	<app file="J64EngineRE_MAC" if="mac" />
 
-	<!-- Just for clarfication -->
+	<!-- For debug builds -->
 	<section if="debug">
 		<app file="J64EngineRE_WIN DEBUG" if="windows" />
 		<app file="J64EngineRE_APP DEBUG" if="linux" />
 		<app file="J64EngineRE_MAC DEBUG" if="mac" />
 	</section>
 
+	<!-- Package Name (Mac) -->
+	<app package="com.joalor64gh.j64enginere" />
+
+	<!-- Main Class State, Game Version, Company (save data) Name -->
+	<app main="Main" version="0.2.8" company="Joalor64GH" />
+
 	<!--Preloader-->
 	<app preloader="flixel.system.FlxPreloader" />
 
@@ -119,6 +125,9 @@
 	<!-- Discord Rich Prescence-->
 	<haxelib name="discord_rpc" if="desktop"/>
 
+	<!-- djFlixel -->
+	<haxelib name="djFlixel"/>
+
 	<!-- Miscellaneous -->
 	<haxelib name="hxcpp-debug-server" if="desktop debug"/>
 	<haxelib name="polymod-joalor64" if="FUTURE_POLYMOD"/>
@@ -168,7 +177,8 @@
 	<error value="You're not using NebulaZorua's fork of luajit. Use that instead." if="${linc_luajit == 0.0.4}" />
 	<error value="You're using Haxe 4.1.5. Please update to 4.2.5 or greater." if="${haxe == 4.1.5}" unless="linux" />
 
-	<!-- Fix for macros -->
+	<!-- _______________________________ Macros Fixes ______________________________ -->
+
 	<haxeflag name="--macro" value="allowPackage('flash')" />
 	<haxeflag name="--macro" value="include('my.pack')" />