Merge pull request #17 from EmeraldLoc/dev

EmeraldLoc · web-flow · commit dfe2be36f71d · 2023-03-14T17:14:55.000-05:00
Merge dev 3 i cant believe this I really gotta figure this out
diff --git a/sm_osx/LauncherView.swift b/sm_osx/LauncherView.swift
@@ -380,9 +380,7 @@ struct LauncherView: View {
                 Task {
                     let result = await checkForUpdates()
                     
-                    if result == 0 {
-                        noUpdateAlert = true
-                    } else {
+                    if result == 1 {
                         updateAlert = true
                     }
                 }
diff --git a/sm_osx/RomView.swift b/sm_osx/RomView.swift
@@ -130,7 +130,7 @@ struct RomView: View {
         //install dependencies
         
         if (repo == .sm64ex_coop || repo == .sm64ex_coop_dev || repo == .moon64) && isArm() {
-            commandsCompile = "echo 'Installing Deps' && brew uninstall glew sdl2; arch -x86_64 /bin/zsh -cl '/usr/local/bin/brew install make mingw-w64 gcc gcc@9 sdl2 pkg-config glew glfw3 libusb audiofile coreutils wget'; "
+            commandsCompile = "echo 'Installing Deps' && brew uninstall glew sdl2; arch -x86_64 /bin/zsh -cl '/usr/local/bin/brew install make mingw-w64 gcc gcc@9 sdl2 pkg-config glew glfw3 libusb audiofile coreutils wget'; brew install make mingw-w64 gcc pkg-config glfw3 libusb audiofile coreutils wget; "
         }
         else {
             commandsCompile = "echo 'Installing Deps' && brew install make mingw-w64 gcc sdl2 pkg-config glew glfw3 libusb audiofile coreutils wget; "

Original file line number	Diff line number	Diff line change
`@@ -380,9 +380,7 @@ struct LauncherView: View {`
`380`	`380`	`Task {`
`381`	`381`	`let result = await checkForUpdates()`
`382`	`382`
`383`		`- if result == 0 {`
`384`		`- noUpdateAlert = true`
`385`		`- } else {`
	`383`	`+ if result == 1 {`
`386`	`384`	`updateAlert = true`
`387`	`385`	`}`
`388`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ struct RomView: View {`
`130`	`130`	`//install dependencies`
`131`	`131`
`132`	`132`	`if (repo == .sm64ex_coop \|\| repo == .sm64ex_coop_dev \|\| repo == .moon64) && isArm() {`
`133`		`- commandsCompile = "echo 'Installing Deps' && brew uninstall glew sdl2; arch -x86_64 /bin/zsh -cl '/usr/local/bin/brew install make mingw-w64 gcc gcc@9 sdl2 pkg-config glew glfw3 libusb audiofile coreutils wget'; "`
	`133`	`+ commandsCompile = "echo 'Installing Deps' && brew uninstall glew sdl2; arch -x86_64 /bin/zsh -cl '/usr/local/bin/brew install make mingw-w64 gcc gcc@9 sdl2 pkg-config glew glfw3 libusb audiofile coreutils wget'; brew install make mingw-w64 gcc pkg-config glfw3 libusb audiofile coreutils wget; "`
`134`	`134`	`}`
`135`	`135`	`else {`
`136`	`136`	`commandsCompile = "echo 'Installing Deps' && brew install make mingw-w64 gcc sdl2 pkg-config glew glfw3 libusb audiofile coreutils wget; "`