1.0.9

FyneApp.toml

@@ -2,5 +2,5 @@
   Icon = "Icon.png"
   Name = "EpochSilicon"
   ID = "com.burkey.epochsilicon"
-  Version = "1.0.7"
+  Version = "1.0.9"
-  Build = 30
+  Build = 31

README.md

@@ -77,7 +77,7 @@ This appears to be a problem with using a built-in version of `rosettax87`. In o
 
 1. Install Xcode command line tools by opening a terminal and typing `xcode-select --install` and following the prompts
 2. Setup [Homebrew](https://brew.sh/) if you don't have it already
-3. Install Cmake by opening a terminal and enter `brew install cmake`
+3. Install Cmake by opening a terminal and enter `brew install cmake`. Cmake must be installed through Homebrew
 3. Run EpochSilicon and click the `Troubleshooting` button
 4. Find the line that says `Build Rosettax87 locally` and click the `Build` button, following the prompts 
 

main.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 )
 
-const appVersion = "1.0.7"
+const appVersion = "1.0.9"
 
 func main() {
 	log.SetupLogging()

pkg/patching/patching.go

@@ -21,6 +21,11 @@ import (
 	"fyne.io/fyne/v2/dialog"
 )
 
+const (
+	CmakePath = "/opt/homebrew/bin/cmake"
+	ClangPath = "/usr/bin/clang"
+)
+
 func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
 	log.Debug("Patch Epoch clicked")
 	if paths.EpochPath == "" {
@@ -486,14 +491,14 @@ func BuildRosetta() (string, string, error) {
 		return "", "", fmt.Errorf("failed to clone repository: %v", err)
 	}
 
-	cmd := exec.Command("cmake", "-B", "build")
+	cmd := exec.Command(CmakePath, "-B", "build")
 	cmd.Dir = clonedDir
 	err = cmd.Run()
 	if err != nil {
 		return "", "", fmt.Errorf("failed to create build files: %v", err)
 	}
 
-	cmd = exec.Command("cmake", "--build", "build")
+	cmd = exec.Command(CmakePath, "--build", "build")
 	cmd.Dir = clonedDir
 	err = cmd.Run()
 	if err != nil {

pkg/ui/popup.go

@@ -208,14 +208,14 @@ func showTroubleshootingPopup() {
 		dialog.NewConfirm("Build rosettax87", msg, func(confirm bool) {
 			if confirm {
 				// Check for dependencies
-				if err := exec.Command("clang", "--version").Run(); err != nil {
+				if err := exec.Command(patching.ClangPath, "--version").Run(); err != nil {
-					m := fmt.Errorf("xcode command line tools are not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again")
+					m := fmt.Errorf("xcode command line tools are not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again. Error: %v", err)
 					log.Error(m.Error())
 					dialog.ShowError(m, currentWindow)
 					return
 				}
-				if err := exec.Command("cmake", "--version").Run(); err != nil {
+				if err := exec.Command(patching.CmakePath, "--version").Run(); err != nil {
-					m := fmt.Errorf("Cmake is not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again")
+					m := fmt.Errorf("Cmake is not installed on your computer. Click the Website button in the app and read the instructions on building rosettax87 before trying again. Error: %v", err)
 					log.Error(m.Error())
 					dialog.ShowError(m, currentWindow)
 					return
@@ -299,11 +299,11 @@ func showTroubleshootingPopup() {
 	troubleshootingCloseButton = widget.NewButton("Close", func() {})
 
 	popupContent := container.NewBorder(
-		nil,                                             // top
+		nil, // top
 		container.NewCenter(troubleshootingCloseButton), // bottom
-		nil,                                             // left
+		nil,                                  // left
-		nil,                                             // right
+		nil,                                  // right
-		container.NewPadded(scrollContainer),            // center
+		container.NewPadded(scrollContainer), // center
 	)
 
 	windowSize := currentWindow.Content().Size()

pkg/ui/status.go

@@ -120,14 +120,12 @@ func updateEpochStatus() {
 		// Check if patched files have the correct size (matches bundled versions)
 		winerosettaDllCorrectSize := utils.CompareFileWithBundledResource(winerosettaDllPath, "winerosetta/winerosetta.dll")
 		d3d9DllCorrectSize := utils.CompareFileWithBundledResource(d3d9DllPath, "winerosetta/d3d9.dll")
-		rosettaX87CorrectSize := utils.CompareFileWithBundledResource(rosettaX87ExePath, "rosettax87/rosettax87")
-		libRuntimeRosettaX87CorrectSize := utils.CompareFileWithBundledResource(libRuntimeRosettaX87Path, "rosettax87/libRuntimeRosettax87")
 
 		if utils.PathExists(winerosettaDllPath) && utils.PathExists(d3d9DllPath) &&
 			utils.DirExists(rosettaX87DirPath) && utils.PathExists(rosettaX87ExePath) &&
 			utils.PathExists(libRuntimeRosettaX87Path) && dllsFileValid &&
 			winerosettaDllCorrectSize && d3d9DllCorrectSize &&
-			rosettaX87CorrectSize && libRuntimeRosettaX87CorrectSize && epochPatchesApplied {
+			epochPatchesApplied {
 			paths.PatchesAppliedEpoch = true
 		}