More bug fixes, v1.2.4

EmeraldLoc · Aug 9, 2022 · c253622 · c253622
1 parent c073b83
commit c253622
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/sm_osx.xcodeproj/project.pbxproj b/sm_osx.xcodeproj/project.pbxproj
@@ -363,7 +363,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -395,7 +395,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/sm_osx/CompilationView.swift b/sm_osx/CompilationView.swift
@@ -155,6 +155,28 @@ struct CompilationView: View {
 
                             compilesSucess = true
 
+                            if doLauncher {
+                                let launcherRepo = LauncherRepos(context: moc)
+
+                                launcherRepo.title = "\(repo)"
+                                launcherRepo.isEditing = false
+                                if repo != .moon64 {
+                                    launcherRepo.path = "~/SM64Repos/\(execPath)/sm64.us.f3dex2e"
+                                }
+                                else {
+                                    launcherRepo.path = "~/SM64Repos/\(execPath)/moon64.us.f3dex2e"
+                                }
+                                launcherRepo.args = ""
+                                launcherRepo.id = UUID()
+
+                                do {
+                                    try moc.save()
+                                }
+                                catch {
+                                    print(error)
+                                }
+                            }
+
                             dismiss.callAsFunction()
                         }
                         else if try! shell.shell("ls ~/SM64Repos/\(execPath)/moon64.us.f3dex2e | echo y", true) == "y\n" {

diff --git a/sm_osx/GlobalFunctions.swift b/sm_osx/GlobalFunctions.swift
@@ -10,7 +10,7 @@ import UniformTypeIdentifiers
 import AppKit
 
 struct CurrentVersion {
-    public let currentVersion = "v1.2.3\n"
+    public let currentVersion = "v1.2.4\n"
 }
 
 public func isArm() -> Bool {

diff --git a/sm_osx/RepoView.swift b/sm_osx/RepoView.swift
@@ -45,10 +45,12 @@ struct RepoView: View {
                             }
                         }
 
-                        NavigationLink(destination: PatchesView(repo: .sm64ex_alo, repoView: $repoView)) {
-
-                            Text("sm64ex-alo")
-                                .lineLimit(nil)
+                        if devMode {
+                            NavigationLink(destination: PatchesView(repo: .sm64ex_alo, repoView: $repoView)) {
+
+                                Text("sm64ex-alo")
+                                    .lineLimit(nil)
+                            }
                         }
 
                         NavigationLink(destination: PatchesView(repo: .sm64ex_coop, repoView: $repoView)) {

diff --git a/sm_osx/RomView.swift b/sm_osx/RomView.swift
@@ -205,10 +205,10 @@ struct RomView: View {
         commandsCompile.append("echo 'Compiling Now' && ")
 
         if repo == .sm64ex_coop || repo == .sm64ex_coop_dev {
-            commandsCompile.append("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=\(extData) DEBUG=\(debug) COLOR=0 \(compSpeed.rawValue)' && ")
+            commandsCompile.append("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)' && ")
         }
         else if repo == .moon64 {
-            commandsCompile.append("cd ~/SM64Repos/\(repo) && arch -x86_64 /bin/zsh -cl 'gmake OSX_BUILD=1 BETTERCAMERA=\(betterCamera) EXTERNAL_DATA=\(extData) NODRAWDISTANCE=\(drawDistance) \(compSpeed.rawValue)' && ")
+            commandsCompile.append("cd ~/SM64Repos/\(repo) && arch -x86_64 /bin/zsh -cl 'gmake OSX_BUILD=1 BETTERCAMERA=\(betterCamera) NODRAWDISTANCE=\(drawDistance) \(compSpeed.rawValue)' && ")
         }
         else if repo == .sm64ex_alo {
             commandsCompile.append("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) && ")