Merge remote-tracking branch 'origin/dev'

Uhh
EmeraldLoc · Oct 28, 2023 · 8bcce72 · 8bcce72
2 parents ee63289 + 0cf39bf
commit 8bcce72
Show file tree

Hide file tree

Showing 15 changed files with 2,901 additions and 2,883 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/appcast.xml b/appcast.xml
@@ -3,12 +3,27 @@
     <channel>
         <title>sm_osx</title>
         <item>
+<<<<<<< HEAD
+=======
+            <title>1.3.4</title>
+            <pubDate>Fri, 27 Oct 2023 22:00:06 -0500</pubDate>
+            <sparkle:version>17</sparkle:version>
+            <sparkle:shortVersionString>1.3.4</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1796523" type="application/octet-stream" sparkle:edSignature="zoxhm3vdYrln8y2b48DK4R2m06aDls3tVl6y1rprtQ1Ri+ILiBS3+P9JH2s/2UR4p9nYcHpzSVMrw0CHrOkXCQ=="/>
+        </item>
+        <item>
+>>>>>>> origin/dev
             <title>1.3.3.1</title>
             <pubDate>Fri, 13 Oct 2023 15:30:33 -0500</pubDate>
             <sparkle:version>16</sparkle:version>
             <sparkle:shortVersionString>1.3.3.1</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
+<<<<<<< HEAD
             <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1892496" type="application/octet-stream" sparkle:edSignature="0L9538PUNNSW8z60A3Ce9N1IZCpdFSBQIAkTC44CxCeFTL1INWemlIUTKpXJcrBkszEp9H5Uar2CyJVcsdlsAg=="/>
+=======
+            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1891917" type="application/octet-stream" sparkle:edSignature="ifbgzUqgjVi/cOmD/fQw6cGqX0N1x/L96ye7eyZPoxf4mVIxerLPx3puWxE7XSmxWIbcePO2il/SyH2gWHhPCw=="/>
+>>>>>>> origin/dev
         </item>
         <item>
             <title>1.3.3</title>
@@ -19,6 +34,7 @@
             <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1890723" type="application/octet-stream" sparkle:edSignature="cS26JijTY1/9AGu5qEYgX2gfRO09m7Oy+KDZ5LkrJak0PH/xS3uX+kWpH4f6sC+LoXTze/6T5Ta6trlYklQ6Cw=="/>
         </item>
         <item>
+<<<<<<< HEAD
             <title>1.3.2</title>
             <pubDate>Wed, 04 Oct 2023 19:14:55 -0500</pubDate>
             <sparkle:version>14</sparkle:version>
@@ -27,6 +43,8 @@
             <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1862868" type="application/octet-stream" sparkle:edSignature="/dQZDwKE2KRwCj2Df33I9+02dFmu4mWYQpPKeDjKAg41e+bVyN4EAJzmqD7ADEIYRX6j7lF9lOHza8BF6vrUAg=="/>
         </item>
         <item>
+=======
+>>>>>>> origin/dev
             <title>1.2.9</title>
             <pubDate>Fri, 24 Mar 2023 16:26:20 -0500</pubDate>
             <sparkle:version>1</sparkle:version>

diff --git a/archives/sm_osx.xcarchive/Info.plist b/archives/sm_osx.xcarchive/Info.plist
@@ -14,9 +14,9 @@
 		<key>CFBundleIdentifier</key>
 		<string>com.CubingStudios.sm-osx</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.3.3.1</string>
+		<string>1.3.4</string>
 		<key>CFBundleVersion</key>
-		<string>16</string>
+		<string>17</string>
 		<key>SigningIdentity</key>
 		<string>Apple Development: [email protected] (VZ9N8YGDP3)</string>
 		<key>Team</key>
@@ -25,7 +25,7 @@
 	<key>ArchiveVersion</key>
 	<integer>2</integer>
 	<key>CreationDate</key>
-	<date>2023-10-13T20:30:27Z</date>
+	<date>2023-10-28T03:00:00Z</date>
 	<key>Name</key>
 	<string>sm_osx</string>
 	<key>SchemeName</key>

diff --git a/...Products/Applications/sm_osx.app/Contents/Frameworks/Sparkle.framework/Versions/B/Sparkle b/...Products/Applications/sm_osx.app/Contents/Frameworks/Sparkle.framework/Versions/B/Sparkle
diff --git a/archives/sm_osx.xcarchive/Products/Applications/sm_osx.app/Contents/Info.plist b/archives/sm_osx.xcarchive/Products/Applications/sm_osx.app/Contents/Info.plist
@@ -21,13 +21,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.3.1</string>
+	<string>1.3.4</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>17</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

diff --git a/archives/sm_osx.xcarchive/Products/Applications/sm_osx.app/Contents/MacOS/sm_osx b/archives/sm_osx.xcarchive/Products/Applications/sm_osx.app/Contents/MacOS/sm_osx
diff --git a/archives/sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Info.plist b/archives/sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Info.plist
@@ -13,8 +13,8 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.3.3.1</string>
+		<string>1.3.4</string>
 		<key>CFBundleVersion</key>
-		<string>16</string>
+		<string>17</string>
 	</dict>
 </plist>
diff --git a/archives/sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Resources/DWARF/sm_osx b/archives/sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Resources/DWARF/sm_osx
diff --git a/.../sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Resources/Relocations/aarch64/sm_osx.yml b/.../sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Resources/Relocations/aarch64/sm_osx.yml
diff --git a/...s/sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Resources/Relocations/x86_64/sm_osx.yml b/...s/sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Resources/Relocations/x86_64/sm_osx.yml
diff --git a/sm_osx.xcodeproj/project.pbxproj b/sm_osx.xcodeproj/project.pbxproj
@@ -455,7 +455,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 6K864V7HLM;
@@ -471,7 +471,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.3.3.1;
+				MARKETING_VERSION = 1.3.4;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -491,7 +491,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 6K864V7HLM;
@@ -507,7 +507,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.3.3.1;
+				MARKETING_VERSION = 1.3.4;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/...deproj/project.xcworkspace/xcuserdata/calebelm.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/calebelm.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/sm_osx/RomView.swift b/sm_osx/RomView.swift
@@ -40,8 +40,8 @@ struct RomView: View {
 
     func compile() {
         //install dependencies
-        if (repo == .sm64ex_coop || repo == .sm64ex_coop_dev || (repo == .custom && customRepo.x86_64)) && isArm() {
-            commandsCompile = "echo 'sm_osx: Installing Deps'; brew uninstall --ignore-dependencies glew sdl2; arch -x86_64 /bin/zsh -cl '/usr/local/bin/brew install make mingw-w64 gcc gcc@9 sdl2 pkg-config glew glfw libusb audiofile coreutils wget'; brew install make mingw-w64 gcc pkg-config glfw libusb audiofile coreutils wget; "
+        if (repo == .custom && customRepo.x86_64) && isArm() {
+            commandsCompile = "echo 'sm_osx: Installing Deps'; brew uninstall --ignore-dependencies glew; brew uninstall --ignore-dependencies sdl2; arch -x86_64 /bin/zsh -cl '/usr/local/bin/brew install make mingw-w64 gcc gcc@9 sdl2 pkg-config glew glfw libusb audiofile coreutils wget'; brew install make mingw-w64 gcc pkg-config glfw libusb audiofile coreutils wget; "
 
             recompileCommands = "echo 'sm_osx: Installing Deps'; brew uninstall --ignore-dependencies glew sdl2; arch -x86_64 /bin/zsh -cl '/usr/local/bin/brew install make mingw-w64 gcc gcc@9 sdl2 pkg-config glew glfw libusb audiofile coreutils wget'; brew install make mingw-w64 gcc pkg-config glfw libusb audiofile coreutils wget; "
         }
@@ -107,7 +107,7 @@ struct RomView: View {
                 compilationCommand = "cd ~/SM64Repos/\(customRepo.name) && gmake \(customRepo.useOsxBuildFlag ? "OSX_BUILD=1" : "") \(customRepo.buildFlags) \(compSpeed.rawValue) &&"
             }
         } else if repo == .sm64ex_coop || repo == .sm64ex_coop_dev {
-            compilationCommand = "cd ~/SM64Repos/\(repo) && arch -x86_64 /bin/zsh -cl 'gmake OSX_BUILD=1 TARGET_ARCH=x86_64-apple-darwin TARGET_BITS=64 USE_APP=0 EXTERNAL_DATA=0 DEBUG=\(debug) COLOR=0 \(compSpeed.rawValue)' && "
+            compilationCommand = "cd ~/SM64Repos/\(repo) && gmake OSX_BUILD=1 USE_APP=0 EXTERNAL_DATA=0 DEBUG=\(debug) COLOR=0 \(compSpeed.rawValue) && "
         }
         else if repo == .sm64ex_alo {
             compilationCommand = "cd ~/SM64Repos/\(repo) && gmake OSX_BUILD=1 BETTERCAMERA=\(betterCamera) EXTERNAL_DATA=0 NODRAWDISTANCE=\(drawDistance) QOL_FEATURES=\(qolFeatures) QOL_FIXES=\(qolFix) HIGH_FPS_PC=\(highFPS) COLOR=0 \(compSpeed.rawValue) && "

diff --git a/sm_osx_releases/appcast.xml b/sm_osx_releases/appcast.xml
@@ -2,13 +2,21 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
     <channel>
         <title>sm_osx</title>
+        <item>
+            <title>1.3.4</title>
+            <pubDate>Fri, 27 Oct 2023 22:00:06 -0500</pubDate>
+            <sparkle:version>17</sparkle:version>
+            <sparkle:shortVersionString>1.3.4</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1796523" type="application/octet-stream" sparkle:edSignature="zoxhm3vdYrln8y2b48DK4R2m06aDls3tVl6y1rprtQ1Ri+ILiBS3+P9JH2s/2UR4p9nYcHpzSVMrw0CHrOkXCQ=="/>
+        </item>
         <item>
             <title>1.3.3.1</title>
             <pubDate>Fri, 13 Oct 2023 15:30:33 -0500</pubDate>
             <sparkle:version>16</sparkle:version>
             <sparkle:shortVersionString>1.3.3.1</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1892496" type="application/octet-stream" sparkle:edSignature="0L9538PUNNSW8z60A3Ce9N1IZCpdFSBQIAkTC44CxCeFTL1INWemlIUTKpXJcrBkszEp9H5Uar2CyJVcsdlsAg=="/>
+            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1891917" type="application/octet-stream" sparkle:edSignature="ifbgzUqgjVi/cOmD/fQw6cGqX0N1x/L96ye7eyZPoxf4mVIxerLPx3puWxE7XSmxWIbcePO2il/SyH2gWHhPCw=="/>
         </item>
         <item>
             <title>1.3.3</title>
@@ -18,14 +26,6 @@
             <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
             <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1890723" type="application/octet-stream" sparkle:edSignature="cS26JijTY1/9AGu5qEYgX2gfRO09m7Oy+KDZ5LkrJak0PH/xS3uX+kWpH4f6sC+LoXTze/6T5Ta6trlYklQ6Cw=="/>
         </item>
-        <item>
-            <title>1.3.2</title>
-            <pubDate>Wed, 04 Oct 2023 19:14:55 -0500</pubDate>
-            <sparkle:version>14</sparkle:version>
-            <sparkle:shortVersionString>1.3.2</sparkle:shortVersionString>
-            <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1862868" type="application/octet-stream" sparkle:edSignature="/dQZDwKE2KRwCj2Df33I9+02dFmu4mWYQpPKeDjKAg41e+bVyN4EAJzmqD7ADEIYRX6j7lF9lOHza8BF6vrUAg=="/>
-        </item>
         <item>
             <title>1.2.9</title>
             <pubDate>Fri, 24 Mar 2023 16:26:20 -0500</pubDate>

diff --git a/sm_osx_releases/sm_osx.zip b/sm_osx_releases/sm_osx.zip