New test (Does this work on Mac?)

.github/workflows/build.yml

@@ -128,20 +128,6 @@ jobs:
         with:
           name: windowsWeek7Build
           path: export/release/windows/bin
-      - name: Compile 32 bit
-        run: haxelib run lime build windows -D32bit -32
-      - name: Publish 32bit
-        uses: actions/upload-artifact@v2
-        with:
-          name: windows32Build
-          path: export/32bit/windows/bin
-      - name: Copy Week 7 Files
-        run: Copy-Item -Force -Recurse ./Week7Assets/* -Destination ./export/32bit/windows/bin/assets
-      - name: Publish Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: windowsWeek732bitBuild
-          path: export/32bit/windows/bin
   buildMac:
     runs-on: macos-latest
 

.github/workflows/win64.yml → .github/workflows/win32.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Win64
+name: Win32
 
 # Controls when the action will run. 
 on:
@@ -16,7 +16,7 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  buildWindows64x:
+  buildWindows32x:
     runs-on: windows-latest
 
     steps:
@@ -50,10 +50,17 @@ jobs:
         shell: cmd
       - name: Create Version Tag
         run: echo "${{github.run_id}}" > VERSION
-      - name: Compile
-        run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id}}"
+      - name: Compile 32 bit
+        run: haxelib run lime build windows -D32bit -32
+      - name: Publish 32bit
+        uses: actions/upload-artifact@v2
+        with:
+          name: windows32Build
+          path: export/32bit/windows/bin
+      - name: Copy Week 7 Files
+        run: Copy-Item -Force -Recurse ./Week7Assets/* -Destination ./export/32bit/windows/bin/assets
       - name: Publish Artifact
         uses: actions/upload-artifact@v2
         with:
-          name: windows64Build
-          path: export/release/windows/bin
+          name: windowsWeek732bitBuild
+          path: export/32bit/windows/bin

source/CategoryState.hx

@@ -39,7 +39,7 @@ class CategoryState extends MusicBeatState
 	override function create()
 	{
 		// it's a js file to make syntax highlighting acceptable
-		#if windows
+		#if cpp
 		// Updating Discord Rich Presence
 		Discord.DiscordClient.changePresence("In the Freeplay Menu", null);
 		#end

source/FreeplayState.hx

@@ -144,7 +144,7 @@ class FreeplayState extends MusicBeatState
 				+ '/freakyMenu'
 				+ TitleState.soundExt));
 		}
-		#if windows
+		#if cpp
 		// Updating Discord Rich Presence
 		var customPrecence = TitleState.discordStuff.freeplay;
 		Discord.DiscordClient.changePresence(customPrecence, null);
@@ -574,4 +574,4 @@ typedef JsonMetadata = {
 	var week:Int;
 	var character:String;
 	var ?flags:Array<String>;
-}
+}

source/MainMenuState.hx

@@ -55,7 +55,7 @@ class MainMenuState extends MusicBeatState
 	public static var version:String = "";
 	override function create()
 	{
-		#if windows
+		#if cpp
 		// Updating Discord Rich Presence
 		var customPrecence = TitleState.discordStuff.mainmenu;
 		Discord.DiscordClient.changePresence(customPrecence, null);

source/PlayState.hx

@@ -92,7 +92,7 @@ enum abstract DisplayLayer(Int) from Int to Int {
 }
 class PlayState extends MusicBeatState
 {
-	#if windows
+	#if cpp
 	public static var customPrecence = FNFAssets.getText("assets/discord/presence/play.txt");
 	#end
 	public static var curStage:String = '';
@@ -166,7 +166,7 @@ class PlayState extends MusicBeatState
 	// private var bfColor:FlxColor = 0xFF149DFF;
 	private var barShowingPoison:Bool = false;
 	private var pixelUI:Bool = false;
-	#if (windows && cpp)
+	#if cpp
 	// Discord RPC variables
 	var storyDifficultyText:String = "";
 	var iconRPC:String = "";
@@ -569,7 +569,7 @@ class PlayState extends MusicBeatState
 			if (Reflect.hasField(Judgement.uiJson, preferredJudgement) && Reflect.field(Judgement.uiJson, preferredJudgement).uses != preferredJudgement)
 				preferredJudgement = Reflect.field(Judgement.uiJson, preferredJudgement).uses;
 		}
-		#if windows
+		#if cpp
 		// Making difficulty text for Discord Rich Presence.
 		// I JUST REALIZED THIS IS NOT VERY COMPATIBILE
 		/*
@@ -2006,7 +2006,7 @@ class PlayState extends MusicBeatState
 				vocals.pause();
 			}
 			controls.setKeyboardScheme(Solo(false));
-			#if windows
+			#if cpp
 			var ae = FNFAssets.getText("assets/discord/presence/playpause.txt");
 			DiscordClient.changePresence(ae
 				+ SONG.song
@@ -2077,7 +2077,7 @@ class PlayState extends MusicBeatState
 					currentIconState = "Being Posioned";
 				}
 			}
-			#if windows
+			#if cpp
 			if (startTimer.finished)
 			{
 				DiscordClient.changePresence(customPrecence
@@ -2120,7 +2120,7 @@ class PlayState extends MusicBeatState
 		vocals.time = Conductor.songPosition;
 		vocals.play();
 
-		#if windows
+		#if cpp
 		DiscordClient.changePresence(detailsText
 			+ " "
 			+ SONG.song
@@ -2251,7 +2251,7 @@ class PlayState extends MusicBeatState
 
 		if (FlxG.keys.justPressed.SEVEN && !OptionsHandler.options.danceMode)
 		{
-			#if windows
+			#if cpp
 			DiscordClient.changePresence("Chart Editor", null, null, true);
 			#end
 			LoadingState.loadAndSwitchState(new ChartingState());
@@ -2324,21 +2324,21 @@ class PlayState extends MusicBeatState
 		{
 			iconP1.iconState = Dying;
 			iconP2.iconState = Winning;
-			#if windows
+			#if cpp
 			iconRPC = player1Icon + "-dead";
 			#end
 		}
 		else
 		{
 			iconP1.iconState = Normal;
-			#if windows
+			#if cpp
 			iconRPC = player1Icon;
 			#end
 		}
 		if (!opponentPlayer && poisonTimes != 0)
 		{
 			iconP1.iconState = Poisoned;
-			#if windows
+			#if cpp
 			iconRPC = player1Icon + "-dazed";
 			#end
 		}	
@@ -2379,14 +2379,14 @@ class PlayState extends MusicBeatState
 			if (iconP1.iconState != Poisoned) {
 				iconP1.iconState = Winning;
 			}
-			#if windows
+			#if cpp
 			if (opponentPlayer)
 				iconRPC = player2Icon + "-dead";
 			#end
 		}
 		else {
 			iconP2.iconState = Normal;
-			#if windows
+			#if cpp
 			if (opponentPlayer)
 				iconRPC = player2Icon;
 			#end
@@ -2396,7 +2396,7 @@ class PlayState extends MusicBeatState
 		}
 		if (poisonTimes != 0 && opponentPlayer) {
 			iconP2.iconState = Poisoned;
-			#if windows
+			#if cpp
 			if (opponentPlayer)
 				iconRPC = player2Icon + "-dazed";
 			#end
@@ -2607,7 +2607,7 @@ class PlayState extends MusicBeatState
 				}
 				else
 					openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
-				#if windows
+				#if cpp
 				// Game Over doesn't get his own variable because it's only used here
 				DiscordClient.changePresence("GAME OVER -- "
 					+ SONG.song
@@ -3098,7 +3098,7 @@ class PlayState extends MusicBeatState
 				campaignAccuracy = campaignAccuracy / defaultPlaylistLength;
 				if (useVictoryScreen)
 				{
-					#if windows
+					#if cpp
 					DiscordClient.changePresence("Reviewing Score -- "
 						+ SONG.song
 						+ " ("
@@ -3165,7 +3165,7 @@ class PlayState extends MusicBeatState
 			trace('WENT BACK TO FREEPLAY??');
 			if (useVictoryScreen)
 			{
-				#if windows
+				#if cpp
 				DiscordClient.changePresence("Reviewing Score -- "
 					+ SONG.song
 					+ " ("
@@ -4038,7 +4038,7 @@ class PlayState extends MusicBeatState
 			songName.cameras = [camHUD];
 
 		}
-		#if windows
+		#if cpp
 		// Song duration in a float, useful for the time left feature
 
 
@@ -4133,7 +4133,7 @@ class PlayState extends MusicBeatState
 		callAllHScript('beatHit', [curBeat]);
 	}
 	function updatePrecence() {
-		#if windows
+		#if cpp
 		// Updating Discord Rich Presence.
 		DiscordClient.changePresence(customPrecence
 			+ " "

source/TitleState.hx

@@ -1,6 +1,6 @@
 package;
 
-#if windows
+#if cpp
 import Discord.DiscordClient;
 #end
 import flixel.FlxG;
@@ -85,7 +85,7 @@ class TitleState extends MusicBeatState
 	override public function create():Void
 	{
 
-		#if windows
+		#if cpp
 		DiscordClient.initialize();
 
 		Application.current.onExit.add(function(exitCode)