From 20c32acda1c0794c2879e0a0f68d111a830a6716 Mon Sep 17 00:00:00 2001
From: George FunBook <gkurelic@gmail.com>
Date: Sat, 11 Sep 2021 00:32:44 -0500
Subject: [PATCH 1/2] remove import

---
 source/animate/ParseAnimate.hx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/animate/ParseAnimate.hx b/source/animate/ParseAnimate.hx
index 4fb51eb59..895637ab6 100644
--- a/source/animate/ParseAnimate.hx
+++ b/source/animate/ParseAnimate.hx
@@ -2,7 +2,6 @@ package animate;
 
 import haxe.format.JsonParser;
 import openfl.Assets;
-import sys.io.File;
 
 /**
  * Generally designed / written in a way that can be easily taken out of FNF and used elsewhere

From 696835c90b8092d6a0966401ee61b29b9bb7fce3 Mon Sep 17 00:00:00 2001
From: George FunBook <gkurelic@gmail.com>
Date: Sat, 11 Sep 2021 00:33:50 -0500
Subject: [PATCH 2/2] polymod compiler checks instead of cpp

---
 Project.xml               | 2 +-
 source/ui/ModMenu.hx      | 2 --
 source/ui/OptionsState.hx | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Project.xml b/Project.xml
index 461e9364e..6d03d07b8 100644
--- a/Project.xml
+++ b/Project.xml
@@ -127,7 +127,7 @@
 	<haxelib name="flixel-ui" />
 	<!--haxelib name="newgrounds" unless="switch"/> -->
 	<haxelib name="faxe" if='switch'/>
-	<haxelib name="polymod"/>
+	<haxelib name="polymod" if="cpp"/>
 	
 	<!-- <haxelib name="colyseus"/> -->
 	<!-- <haxelib name="colyseus-websocket" /> -->
diff --git a/source/ui/ModMenu.hx b/source/ui/ModMenu.hx
index 9780fb0b5..bd87d290d 100644
--- a/source/ui/ModMenu.hx
+++ b/source/ui/ModMenu.hx
@@ -3,10 +3,8 @@ package ui;
 import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
-#if cpp
 import polymod.Polymod;
 import sys.FileSystem;
-#end
 
 class ModMenu extends ui.OptionsState.Page
 {
diff --git a/source/ui/OptionsState.hx b/source/ui/OptionsState.hx
index 887795e34..68f54c2fa 100644
--- a/source/ui/OptionsState.hx
+++ b/source/ui/OptionsState.hx
@@ -32,7 +32,7 @@ class OptionsState extends MusicBeatState
 		var controls = addPage(Controls, new ControlsMenu());
 		// var colors = addPage(Colors, new ColorsMenu());
 
-		#if cpp
+		#if polymod
 		var mods = addPage(Mods, new ModMenu());
 		#end
 
@@ -43,7 +43,7 @@ class OptionsState extends MusicBeatState
 			// colors.onExit.add(switchPage.bind(Options));
 			preferences.onExit.add(switchPage.bind(Options));
 
-			#if cpp
+			#if polymod
 			mods.onExit.add(switchPage.bind(Options));
 			#end
 		}
@@ -179,7 +179,7 @@ class OptionsMenu extends Page
 		createItem('preferences', function() switchPage(Preferences));
 		createItem("controls", function() switchPage(Controls));
 		// createItem('colors', function() switchPage(Colors));
-		#if cpp
+		#if polymod
 		createItem('mods', function() switchPage(Mods));
 		#end