From 4401ea0c9a8de8ff25ac00440e8a1d1f2d00807d Mon Sep 17 00:00:00 2001
From: MAJigsaw77 <77043862+MAJigsaw77@users.noreply.github.com>
Date: Fri, 22 Aug 2025 20:47:37 +0300
Subject: [PATCH] Organize ios project folder a little.

---
 source/funkin/external/ios/project/Build.xml  | 22 +++++++++----------
 .../{ios => }/include/AudioSession.hpp        |  0
 .../project/{ios => }/include/ScreenUtil.hpp  |  0
 .../ios/project/{ios => }/src/AudioSession.mm |  0
 .../ios/project/{ios => }/src/ScreenUtil.mm   |  0
 .../funkin/external/windows/project/Build.xml |  2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)
 rename source/funkin/external/ios/project/{ios => }/include/AudioSession.hpp (100%)
 rename source/funkin/external/ios/project/{ios => }/include/ScreenUtil.hpp (100%)
 rename source/funkin/external/ios/project/{ios => }/src/AudioSession.mm (100%)
 rename source/funkin/external/ios/project/{ios => }/src/ScreenUtil.mm (100%)

diff --git a/source/funkin/external/ios/project/Build.xml b/source/funkin/external/ios/project/Build.xml
index a81ee08f2..f3baf57e1 100644
--- a/source/funkin/external/ios/project/Build.xml
+++ b/source/funkin/external/ios/project/Build.xml
@@ -3,27 +3,25 @@
 	<pragma once="true" />
 
 	<files id="haxe">
-		<compilerflag value="-I${this_dir}/ios/include" if="iphoneos || iphonesim" />
+		<compilerflag value="-I${this_dir}/include" />
 	</files>
 
 	<files id="__main__">
-		<compilerflag value="-I${this_dir}/ios/include" if="iphoneos || iphonesim" />
+		<compilerflag value="-I${this_dir}/include" />
 	</files>
 
-	<files id="external-ios" dir="${this_dir}/ios" if="iphoneos || iphonesim">
-		<compilerflag value="-I${this_dir}/ios/include" />
+	<files id="external-ios">
+		<compilerflag value="-I${this_dir}/include" />
 
-		<file name="src/ScreenUtil.mm" />
-		<file name="src/AudioSession.mm" />
+		<file name="${this_dir}/src/ScreenUtil.mm" />
+		<file name="${this_dir}/src/AudioSession.mm" />
 	</files>
 
 	<target id="haxe">
-		<section if="iphoneos || iphonesim">
-			<vflag name="-framework" value="UIKit" />
-			<vflag name="-framework" value="Foundation" />
-			<vflag name="-framework" value="AVFAudio" />
-		</section>
+		<vflag name="-framework" value="UIKit" />
+		<vflag name="-framework" value="Foundation" />
+		<vflag name="-framework" value="AVFAudio" />
 
-		<files id="external-ios" if="iphoneos || iphonesim" />
+		<files id="external-ios" />
 	</target>
 </xml>
diff --git a/source/funkin/external/ios/project/ios/include/AudioSession.hpp b/source/funkin/external/ios/project/include/AudioSession.hpp
similarity index 100%
rename from source/funkin/external/ios/project/ios/include/AudioSession.hpp
rename to source/funkin/external/ios/project/include/AudioSession.hpp
diff --git a/source/funkin/external/ios/project/ios/include/ScreenUtil.hpp b/source/funkin/external/ios/project/include/ScreenUtil.hpp
similarity index 100%
rename from source/funkin/external/ios/project/ios/include/ScreenUtil.hpp
rename to source/funkin/external/ios/project/include/ScreenUtil.hpp
diff --git a/source/funkin/external/ios/project/ios/src/AudioSession.mm b/source/funkin/external/ios/project/src/AudioSession.mm
similarity index 100%
rename from source/funkin/external/ios/project/ios/src/AudioSession.mm
rename to source/funkin/external/ios/project/src/AudioSession.mm
diff --git a/source/funkin/external/ios/project/ios/src/ScreenUtil.mm b/source/funkin/external/ios/project/src/ScreenUtil.mm
similarity index 100%
rename from source/funkin/external/ios/project/ios/src/ScreenUtil.mm
rename to source/funkin/external/ios/project/src/ScreenUtil.mm
diff --git a/source/funkin/external/windows/project/Build.xml b/source/funkin/external/windows/project/Build.xml
index c991b916b..d68c41301 100644
--- a/source/funkin/external/windows/project/Build.xml
+++ b/source/funkin/external/windows/project/Build.xml
@@ -24,7 +24,7 @@
         <lib name="-ladvapi32" />
     </section>
 
-    <section if="windows" unless="mingw">
+    <section unless="mingw">
         <lib name="user32.lib" />
         <lib name="kernel32.lib" />
         <lib name="dwmapi.lib" />