Skip to content

Commit

Permalink
Merge pull request #17 from EmeraldLoc/dev
Browse files Browse the repository at this point in the history
Merge dev 3 i cant believe this I really gotta figure this out
  • Loading branch information
EmeraldLoc authored Mar 14, 2023
2 parents 369c66e + 075c7ba commit dfe2be3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions sm_osx/LauncherView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,7 @@ struct LauncherView: View {
Task {
let result = await checkForUpdates()

if result == 0 {
noUpdateAlert = true
} else {
if result == 1 {
updateAlert = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion sm_osx/RomView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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; "
Expand Down

0 comments on commit dfe2be3

Please sign in to comment.