change how to check for dependencies
This commit is contained in:
6
Makefile
6
Makefile
@@ -19,11 +19,7 @@ build: build-dev
|
|||||||
build-release:
|
build-release:
|
||||||
@rm -rf ./EpochSilicon.app
|
@rm -rf ./EpochSilicon.app
|
||||||
@echo "Building optimized release version..."
|
@echo "Building optimized release version..."
|
||||||
CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build \
|
CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -trimpath -tags=release -o epochsilicon .
|
||||||
-ldflags="-s -w \
|
|
||||||
-trimpath \
|
|
||||||
-tags=release \
|
|
||||||
-o epochsilicon .
|
|
||||||
@echo "Packaging with fyne..."
|
@echo "Packaging with fyne..."
|
||||||
GOOS=darwin GOARCH=arm64 fyne package --release --executable epochsilicon
|
GOOS=darwin GOARCH=arm64 fyne package --release --executable epochsilicon
|
||||||
@echo "Copying additional resources to app bundle..."
|
@echo "Copying additional resources to app bundle..."
|
||||||
|
@@ -4,6 +4,8 @@
|
|||||||
|
|
||||||
A user-friendly launcher for Project Epoch on Apple Silicon Macs, with one-click patching of winerosetta, rosettax87 and d9vk.
|
A user-friendly launcher for Project Epoch on Apple Silicon Macs, with one-click patching of winerosetta, rosettax87 and d9vk.
|
||||||
|
|
||||||
|
**This software is currently in active development, there WILL be bugs and constant updates as Epoch rolls out**
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* **Apple Silicon Compatibility:** Runs 32-bit DirectX9 World of Warcraft (v3.3.5a) on M1/M2/M3/M4 Macs without "illegal instruction" errors.
|
* **Apple Silicon Compatibility:** Runs 32-bit DirectX9 World of Warcraft (v3.3.5a) on M1/M2/M3/M4 Macs without "illegal instruction" errors.
|
||||||
@@ -122,9 +124,7 @@ TBD
|
|||||||
|
|
||||||
## Bundled Binaries
|
## Bundled Binaries
|
||||||
|
|
||||||
The `rosettax87` and `winerosetta` components included in this application are precompiled for convenience. If you prefer, you can compile them yourself by following the instructions provided by Lifeisawful on the official repositories:
|
The `rosettax87` and `winerosetta` components included in this application are precompiled for convenience. You can compile them yourself by following the instructions provided above in the Troubleshooting section
|
||||||
[https://github.com/Lifeisawful/winerosetta](https://github.com/Lifeisawful/winerosetta)
|
|
||||||
[https://github.com/Lifeisawful/rosettax87](https://github.com/Lifeisawful/rosettax87)
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
@@ -138,5 +138,5 @@ All credit for the core translation layer `winerosetta` and `rosettax87` goes to
|
|||||||
|
|
||||||
[https://github.com/Lifeisawful/rosettax87](https://github.com/Lifeisawful/rosettax87)
|
[https://github.com/Lifeisawful/rosettax87](https://github.com/Lifeisawful/rosettax87)
|
||||||
|
|
||||||
EpochSilicon is a fork of [https://turtlesilicon.github.io/](TurtleSilicon), credit for the base of the application goes to tairasu.
|
EpochSilicon is a fork of [https://turtlesilicon.github.io/](TurtleSilicon), credit for the base of the application goes to [**@tairasu**](https://github.com/tairasu)
|
||||||
|
|
||||||
|
@@ -208,13 +208,13 @@ func showTroubleshootingPopup() {
|
|||||||
dialog.NewConfirm("Build rosettax87", msg, func(confirm bool) {
|
dialog.NewConfirm("Build rosettax87", msg, func(confirm bool) {
|
||||||
if confirm {
|
if confirm {
|
||||||
// Check for dependencies
|
// Check for dependencies
|
||||||
if _, err := exec.LookPath("clang"); err != nil {
|
if err := exec.Command("clang", "--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")
|
||||||
log.Error(m.Error())
|
log.Error(m.Error())
|
||||||
dialog.ShowError(m, currentWindow)
|
dialog.ShowError(m, currentWindow)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if _, err := exec.LookPath("cmake"); err != nil {
|
if err := exec.Command("cmake", "--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")
|
||||||
log.Error(m.Error())
|
log.Error(m.Error())
|
||||||
dialog.ShowError(m, currentWindow)
|
dialog.ShowError(m, currentWindow)
|
||||||
|
Reference in New Issue
Block a user