Update v0.0.17

george012 · Jun 14, 2024 · a2cfb70 · a2cfb70
1 parent 90a1f5d
commit a2cfb70
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 12 deletions.
diff --git a/cgo_darwin_amd64.go b/cgo_darwin_amd64.go
@@ -3,6 +3,6 @@
 package fltk_go
 
 // #cgo darwin,amd64 CXXFLAGS: -std=c++11
-// #cgo darwin,amd64 CPPFLAGS: -I${SRCDIR}/lib/darwin/amd64 -I${SRCDIR}/include -I${SRCDIR}/include/FL/images -I${SRCDIR}/include/png -I${SRCDIR}/include/zlib -I${SRCDIR}/include/jpeg -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
+// #cgo darwin,amd64 CPPFLAGS: -I${SRCDIR}/lib/darwin/amd64 -I${SRCDIR}/include -I${SRCDIR}/include/FL/images -I${SRCDIR}/include/png -I${SRCDIR}/include/zlib -I${SRCDIR}/include/jpeg -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
 // #cgo darwin,amd64 LDFLAGS: ${SRCDIR}/lib/darwin/amd64/libfltk_images.a ${SRCDIR}/lib/darwin/amd64/libfltk_jpeg.a ${SRCDIR}/lib/darwin/amd64/libfltk_png.a ${SRCDIR}/lib/darwin/amd64/libfltk_z.a ${SRCDIR}/lib/darwin/amd64/libfltk_gl.a -framework OpenGL ${SRCDIR}/lib/darwin/amd64/libfltk_forms.a ${SRCDIR}/lib/darwin/amd64/libfltk.a -lm -lpthread -framework Cocoa
 import "C"
diff --git a/config/config.go b/config/config.go
@@ -2,5 +2,5 @@ package config
 
 const (
 	ProjectName    = "fltk_go"
-	ProjectVersion = "v0.0.16"
+	ProjectVersion = "v0.0.17"
 )
diff --git a/fltk-build.go b/fltk-build.go
@@ -143,16 +143,23 @@ func main() {
 		cmakeCmd.Args = append(cmakeCmd.Args, "-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0")
 
 		// Get the SDK path using xcrun
-		//sdkPathCmd := exec.Command("xcrun", "--sdk", "macosx", "--show-sdk-path")
-		//sdkPathOutput, err := sdkPathCmd.Output()
-		//if err != nil {
-		//	fmt.Printf("Error getting SDK path, %v\n", err)
-		//	os.Exit(1)
-		//}
-		//sdkPath := strings.TrimSpace(string(sdkPathOutput))
-		//cmakeCmd.Args = append(cmakeCmd.Args, "-DCMAKE_OSX_SYSROOT="+sdkPath)
-
-		cmakeCmd.Args = append(cmakeCmd.Args, "-DCMAKE_OSX_SYSROOT="+"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk")
+		sdkPathCmd := exec.Command("xcrun", "--sdk", "macosx", "--show-sdk-path")
+		sdkPathOutput, err := sdkPathCmd.Output()
+		if err != nil {
+			fmt.Printf("Error getting SDK path, %v\n", err)
+			os.Exit(1)
+		}
+		normalDir := "MacOSX.sdk"
+		// 获取目录路径和最后一层目录名称
+		dir, _ := filepath.Split(string(sdkPathOutput))
+		// 获取父目录
+		parentDir := filepath.Dir(dir)
+		// 拼接新路径
+		newPath := filepath.Join(parentDir, normalDir)
+		sdkPath := strings.TrimSpace(string(newPath))
+		cmakeCmd.Args = append(cmakeCmd.Args, "-DCMAKE_OSX_SYSROOT="+sdkPath)
+
+		//cmakeCmd.Args = append(cmakeCmd.Args, "-DCMAKE_OSX_SYSROOT="+"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk")
 
 		if runtime.GOARCH == "amd64" {
 			cmakeCmd.Args = append(cmakeCmd.Args, "-DCMAKE_OSX_ARCHITECTURES=x86_64")

diff --git a/lib/darwin/amd64/libfltk.a b/lib/darwin/amd64/libfltk.a
diff --git a/lib/darwin/amd64/libfltk_forms.a b/lib/darwin/amd64/libfltk_forms.a
diff --git a/lib/darwin/amd64/libfltk_gl.a b/lib/darwin/amd64/libfltk_gl.a
diff --git a/lib/darwin/amd64/libfltk_images.a b/lib/darwin/amd64/libfltk_images.a
diff --git a/lib/darwin/amd64/libfltk_jpeg.a b/lib/darwin/amd64/libfltk_jpeg.a
diff --git a/lib/darwin/amd64/libfltk_png.a b/lib/darwin/amd64/libfltk_png.a
diff --git a/lib/darwin/amd64/libfltk_z.a b/lib/darwin/amd64/libfltk_z.a