internal/graphicsdriver/opengl: remove CGO in opengl for macOS (hajim…

…ehoshi#2091) Updates hajimehoshi#1162
xiaoshengduan · May 21, 2022 · f7e2198 · f7e2198
1 parent 7eeef3a
commit f7e2198
Show file tree

Hide file tree

Showing 8 changed files with 712 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/hajimehoshi/ebiten/v2
 go 1.15
 
 require (
+	github.com/ebiten/purego v0.0.0-20220521023924-36e492b737b8
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220516021902-eb3e265c7661
 	github.com/hajimehoshi/bitmapfont/v2 v2.2.0
 	github.com/hajimehoshi/file2byteslice v0.0.0-20210813153925-5340248a8f41

diff --git a/go.sum b/go.sum
@@ -1,4 +1,6 @@
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/ebiten/purego v0.0.0-20220521023924-36e492b737b8 h1:poLXyG4bbBg1xgb/WWXGMquXtZF8GUBIuLeM4qQ9cNw=
+github.com/ebiten/purego v0.0.0-20220521023924-36e492b737b8/go.mod h1:639Gr28MPEst8oS4Hzv2YSKteDc3y/5cal9PeUINHQQ=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220516021902-eb3e265c7661 h1:1bpooddSK2996NWM/1TW59cchQOm9MkoV9DkhSJH1BI=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220516021902-eb3e265c7661/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/hajimehoshi/bitmapfont/v2 v2.2.0 h1:E6vzlchynZj6OVohVKFqWkKW348EmDW62K5zPXDi7A8=

diff --git a/...csdriver/opengl/gl/conversions_windows.go → .../graphicsdriver/opengl/gl/conversions2.go b/...csdriver/opengl/gl/conversions_windows.go → .../graphicsdriver/opengl/gl/conversions2.go
@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: MIT
 
+//go:build darwin || windows
+// +build darwin windows
+
 package gl
 
 import (

diff --git a/...river/opengl/gl/conversions_notwindows.go → ...icsdriver/opengl/gl/conversions_others.go b/...river/opengl/gl/conversions_notwindows.go → ...icsdriver/opengl/gl/conversions_others.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 
-//go:build !windows
-// +build !windows
+//go:build !darwin && !windows
+// +build !darwin,!windows
 
 package gl