diff --git a/v2/internal/appng/app_default_darwin.go b/v2/internal/appng/app_default_darwin.go new file mode 100644 index 00000000..9db9dcc0 --- /dev/null +++ b/v2/internal/appng/app_default_darwin.go @@ -0,0 +1,32 @@ +//go:build !dev && !production && darwin + +package appng + +import ( + "fmt" + + "github.com/wailsapp/wails/v2/pkg/options" +) + +// App defines a Wails application structure +type App struct{} + +func (a *App) Run() error { + return nil +} + +// CreateApp creates the app! +func CreateApp(_ *options.App) (*App, error) { + // result := w32.MessageBox(0, + // `Wails applications will not build without the correct build tags. + //Please use "wails build" or press "OK" to open the documentation on how to use "go build"`, + // "Error", + // w32.MB_ICONERROR|w32.MB_OKCANCEL) + // if result == 1 { + // exec.Command("rundll32", "url.dll,FileProtocolHandler", "https://wails.io").Start() + // } + + err := fmt.Errorf(`Wails applications will not build without the correct build tags.`) + + return nil, err +} diff --git a/v2/internal/appng/app_default.go b/v2/internal/appng/app_default_windows.go similarity index 99% rename from v2/internal/appng/app_default.go rename to v2/internal/appng/app_default_windows.go index d87d51c1..d387ddc5 100644 --- a/v2/internal/appng/app_default.go +++ b/v2/internal/appng/app_default_windows.go @@ -3,9 +3,10 @@ package appng import ( + "os/exec" + "github.com/leaanthony/winc/w32" "github.com/wailsapp/wails/v2/pkg/options" - "os/exec" ) // App defines a Wails application structure diff --git a/v2/internal/frontend/desktop/darwin/frontend.go b/v2/internal/frontend/desktop/darwin/frontend.go index f3a38609..f49944b5 100644 --- a/v2/internal/frontend/desktop/darwin/frontend.go +++ b/v2/internal/frontend/desktop/darwin/frontend.go @@ -8,7 +8,6 @@ import ( "log" "runtime" - "github.com/leaanthony/winc" "github.com/wailsapp/wails/v2/internal/binding" "github.com/wailsapp/wails/v2/internal/frontend" "github.com/wailsapp/wails/v2/internal/frontend/assetserver" @@ -234,7 +233,7 @@ func (f *Frontend) WindowSetRGBA(col *options.RGBA) { } func (f *Frontend) Quit() { - winc.Exit() + //winc.Exit() } /* diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index a92bd558..ddc054ef 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -1,4 +1,5 @@ //go:build windows +// +build windows package windows