github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-04 03:40:45 +08:00
Code Projects Activity

[mac] try dynamically linking UTIFramework during cgo build

Browse Source
This commit is contained in:
Lea\Anthony 2021-12-11 19:36:17 +11:00
parent e12b630dfb
commit 62adcab722
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2/internal/frontend/desktop/darwin/frontend.go
View File

@ -5,7 +5,7 @@ package darwin
/* /*
#cgo CFLAGS: -x objective-c #cgo CFLAGS: -x objective-c
#cgo LDFLAGS: -framework Foundation -framework Cocoa -framework WebKit -framework UniformTypeIdentifiers #cgo LDFLAGS: -framework Foundation -framework Cocoa -framework WebKit
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "Application.h" #import "Application.h"
#import "WailsContext.h" #import "WailsContext.h"

11
v2/pkg/commands/build/base.go
View File

@ -3,6 +3,7 @@ package build
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/wailsapp/wails/v2/internal/system"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -319,11 +320,21 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
return "1" return "1"
}) })
if options.Platform == "darwin" { if options.Platform == "darwin" {
// Determine verison
info, err := system.GetInfo()
if err != nil {
return err
}
versionSplit := strings.Split(info.OS.Version, ".")
addUTIFramework := versionSplit[0] == "10"
// Set the minimum Mac SDK to 10.13 // Set the minimum Mac SDK to 10.13
cmd.Env = upsertEnv(cmd.Env, "CGO_LDFLAGS", func(v string) string { cmd.Env = upsertEnv(cmd.Env, "CGO_LDFLAGS", func(v string) string {
if v != "" { if v != "" {
v += " " v += " "
} }
if addUTIFramework {
v += "-framework UniformTypeIdentifiers "
}
v += "-mmacosx-version-min=10.13" v += "-mmacosx-version-min=10.13"
return v return v