From 428b1263d92e813ff9ce379347d5851e17f72a8d Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 9 Jul 2022 15:19:47 +0900 Subject: [PATCH] add ebitenginecbackend build tag besides ebitencbackend Updates #2111 Updates #2190 --- .github/workflows/test.yml | 3 ++- audio/internal/cbackend/context.go | 4 ++-- audio/internal/cbackend/player.go | 4 ++-- audio/oto.go | 4 ++-- audio/player_cbackend.go | 4 ++-- audio/player_js.go | 4 ++-- audio/player_notjs.go | 4 ++-- genkeys.go | 8 ++++---- internal/cbackend/cbackend.go | 4 ++-- internal/gamepad/api_desktop_windows.go | 4 ++-- internal/gamepad/api_ios.go | 4 ++-- internal/gamepad/api_linux.go | 4 ++-- internal/gamepad/api_xbox_windows.go | 4 ++-- internal/gamepad/extern_android.go | 4 ++-- internal/gamepad/gamepad_android.go | 4 ++-- internal/gamepad/gamepad_cbackend.go | 4 ++-- internal/gamepad/gamepad_darwin.go | 4 ++-- internal/gamepad/gamepad_desktop_windows.go | 4 ++-- internal/gamepad/gamepad_ios.go | 4 ++-- internal/gamepad/gamepad_linux.go | 4 ++-- internal/gamepad/gamepad_windows.go | 4 ++-- internal/gamepad/gamepad_xbox_windows.go | 4 ++-- internal/graphicsdriver/opengl/gl/package_others.go | 2 +- internal/graphicsdriver/opengl/gl/procaddr_others.go | 6 +++--- internal/ui/hideconsole_notwindows.go | 4 ++-- internal/ui/hideconsole_windows.go | 4 ++-- internal/ui/input_cbackend.go | 4 ++-- internal/ui/input_glfw.go | 4 ++-- internal/ui/input_mobile.go | 3 ++- internal/ui/keys_glfw.go | 4 ++-- internal/ui/keys_mobile.go | 3 ++- internal/ui/run_notsinglethread.go | 4 ++-- internal/ui/run_singlethread.go | 4 ++-- internal/ui/ui_cbackend.go | 4 ++-- internal/ui/ui_glfw.go | 4 ++-- internal/ui/ui_glfw_darwin.go | 4 ++-- internal/ui/ui_glfw_unix.go | 4 ++-- internal/ui/ui_glfw_windows.go | 4 ++-- internal/ui/ui_mobile.go | 3 ++- internal/ui/window_glfw.go | 4 ++-- internal/vibrate/vibrate_android.go | 4 ++-- internal/vibrate/vibrate_ios.go | 4 ++-- internal/vibrate/vibrate_null.go | 4 ++-- 43 files changed, 88 insertions(+), 84 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7dfb38d33..72c88d309 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -101,7 +101,8 @@ jobs: - name: go build (cbackend) if: ${{ !startsWith(matrix.os, 'windows-') }} run: | - go build -tags=example,ebitencbackend -v ./... + go build -tags=example,ebitenginecbackend -v ./... + go build -tags=example,ebitencbackend -v ./... # For backward compatibility. Remove this in the future (#2190). - name: go test # TODO: Add more test environments (#1305) diff --git a/audio/internal/cbackend/context.go b/audio/internal/cbackend/context.go index 5f5232f7b..e3618c0a4 100644 --- a/audio/internal/cbackend/context.go +++ b/audio/internal/cbackend/context.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitencbackend -// +build ebitencbackend +//go:build ebitenginecbackend || ebitencbackend +// +build ebitenginecbackend ebitencbackend package cbackend diff --git a/audio/internal/cbackend/player.go b/audio/internal/cbackend/player.go index 3aeb7f564..1e31a4ed5 100644 --- a/audio/internal/cbackend/player.go +++ b/audio/internal/cbackend/player.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitencbackend -// +build ebitencbackend +//go:build ebitenginecbackend || ebitencbackend +// +build ebitenginecbackend ebitencbackend // TODO: This implementation is very similar to github.com/hajimehoshi/oto/v2's player.go // Unify them if possible. diff --git a/audio/oto.go b/audio/oto.go index ff67f5a8f..b18f0c40c 100644 --- a/audio/oto.go +++ b/audio/oto.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package audio diff --git a/audio/player_cbackend.go b/audio/player_cbackend.go index 867df085b..d84f7d9db 100644 --- a/audio/player_cbackend.go +++ b/audio/player_cbackend.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitencbackend -// +build ebitencbackend +//go:build ebitenginecbackend || ebitencbackend +// +build ebitenginecbackend ebitencbackend package audio diff --git a/audio/player_js.go b/audio/player_js.go index 1570b65f7..93c13fa78 100644 --- a/audio/player_js.go +++ b/audio/player_js.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package audio diff --git a/audio/player_notjs.go b/audio/player_notjs.go index ddb219f22..2b9dbb44b 100644 --- a/audio/player_notjs.go +++ b/audio/player_notjs.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !js && !ebitencbackend -// +build !js,!ebitencbackend +//go:build !js && !ebitenginecbackend && !ebitencbackend +// +build !js,!ebitenginecbackend,!ebitencbackend package audio diff --git a/genkeys.go b/genkeys.go index fb93a82df..e3b31c149 100644 --- a/genkeys.go +++ b/genkeys.go @@ -830,12 +830,12 @@ func main() { buildTag = "//go:build !js" + "\n// +build !js" case filepath.Join("internal", "ui", "keys_mobile.go"): - buildTag = "//go:build (android || ios) && !ebitencbackend" + + buildTag = "//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend" + "\n// +build android ios" + - "\n// +build !ebitencbackend" + "\n// +build !ebitenginecbackend && !ebitencbackend" case filepath.Join("internal", "ui", "keys_glfw.go"): - buildTag = "//go:build !android && !ios && !js && !ebitencbackend" + - "\n// +build !android,!ios,!js,!ebitencbackend" + buildTag = "//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend" + + "\n// +build !android,!ios,!js,!ebitenginecbackend && !ebitencbackend" } // NOTE: According to godoc, maps are automatically sorted by key. if err := tmpl.Execute(f, struct { diff --git a/internal/cbackend/cbackend.go b/internal/cbackend/cbackend.go index 08dc17be4..68a1387a6 100644 --- a/internal/cbackend/cbackend.go +++ b/internal/cbackend/cbackend.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitencbackend -// +build ebitencbackend +//go:build ebitenginecbackend || ebitencbackend +// +build ebitenginecbackend ebitencbackend package cbackend diff --git a/internal/gamepad/api_desktop_windows.go b/internal/gamepad/api_desktop_windows.go index 9e07a0e65..c6353d62f 100644 --- a/internal/gamepad/api_desktop_windows.go +++ b/internal/gamepad/api_desktop_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/api_ios.go b/internal/gamepad/api_ios.go index 4fd278271..d44c72ff8 100644 --- a/internal/gamepad/api_ios.go +++ b/internal/gamepad/api_ios.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ios && !ebitencbackend -// +build ios,!ebitencbackend +//go:build ios && !ebitenginecbackend && !ebitencbackend +// +build ios,!ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/api_linux.go b/internal/gamepad/api_linux.go index e751b2182..2de875dee 100644 --- a/internal/gamepad/api_linux.go +++ b/internal/gamepad/api_linux.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ebitencbackend -// +build !android,!ebitencbackend +//go:build !android && !ebitenginecbackend && !ebitencbackend +// +build !android,!ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/api_xbox_windows.go b/internal/gamepad/api_xbox_windows.go index d1761ed89..e33f6925e 100644 --- a/internal/gamepad/api_xbox_windows.go +++ b/internal/gamepad/api_xbox_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/extern_android.go b/internal/gamepad/extern_android.go index 30608e740..ea668b40a 100644 --- a/internal/gamepad/extern_android.go +++ b/internal/gamepad/extern_android.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_android.go b/internal/gamepad/gamepad_android.go index 3cf0bfd68..e109fe70b 100644 --- a/internal/gamepad/gamepad_android.go +++ b/internal/gamepad/gamepad_android.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_cbackend.go b/internal/gamepad/gamepad_cbackend.go index cad389dd2..b6a9bd215 100644 --- a/internal/gamepad/gamepad_cbackend.go +++ b/internal/gamepad/gamepad_cbackend.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitencbackend -// +build ebitencbackend +//go:build ebitenginecbackend || ebitencbackend +// +build ebitenginecbackend ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_darwin.go b/internal/gamepad/gamepad_darwin.go index 5b0c13bdd..85768ac75 100644 --- a/internal/gamepad/gamepad_darwin.go +++ b/internal/gamepad/gamepad_darwin.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ios && !ebitencbackend -// +build !ios,!ebitencbackend +//go:build !ios && !ebitenginecbackend && !ebitencbackend +// +build !ios,!ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_desktop_windows.go b/internal/gamepad/gamepad_desktop_windows.go index 039cba1df..316c50ba7 100644 --- a/internal/gamepad/gamepad_desktop_windows.go +++ b/internal/gamepad/gamepad_desktop_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_ios.go b/internal/gamepad/gamepad_ios.go index 2209a9247..49c2e8bae 100644 --- a/internal/gamepad/gamepad_ios.go +++ b/internal/gamepad/gamepad_ios.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ios && !ebitencbackend -// +build ios,!ebitencbackend +//go:build ios && !ebitenginecbackend && !ebitencbackend +// +build ios,!ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_linux.go b/internal/gamepad/gamepad_linux.go index 95f2cf558..603a4f233 100644 --- a/internal/gamepad/gamepad_linux.go +++ b/internal/gamepad/gamepad_linux.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ebitencbackend -// +build !android,!ebitencbackend +//go:build !android && !ebitenginecbackend && !ebitencbackend +// +build !android,!ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_windows.go b/internal/gamepad/gamepad_windows.go index ac8b77802..e82b9d6c6 100644 --- a/internal/gamepad/gamepad_windows.go +++ b/internal/gamepad/gamepad_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_xbox_windows.go b/internal/gamepad/gamepad_xbox_windows.go index fdc219380..d2ffc625e 100644 --- a/internal/gamepad/gamepad_xbox_windows.go +++ b/internal/gamepad/gamepad_xbox_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package gamepad diff --git a/internal/graphicsdriver/opengl/gl/package_others.go b/internal/graphicsdriver/opengl/gl/package_others.go index 3f365248a..47b35263b 100644 --- a/internal/graphicsdriver/opengl/gl/package_others.go +++ b/internal/graphicsdriver/opengl/gl/package_others.go @@ -5,7 +5,7 @@ package gl -// #cgo linux,!ebitencbackend freebsd,!ebitencbackend openbsd,!ebitencbackend pkg-config: gl +// #cgo linux,!ebitenginecbackend && !ebitencbackend freebsd,!ebitencbackend openbsd,!ebitencbackend pkg-config: gl // // #ifndef APIENTRY // #define APIENTRY diff --git a/internal/graphicsdriver/opengl/gl/procaddr_others.go b/internal/graphicsdriver/opengl/gl/procaddr_others.go index dff93606d..b371ea415 100644 --- a/internal/graphicsdriver/opengl/gl/procaddr_others.go +++ b/internal/graphicsdriver/opengl/gl/procaddr_others.go @@ -19,10 +19,10 @@ package gl /* #cgo linux freebsd openbsd CFLAGS: -DTAG_POSIX -#cgo linux,!ebitencbackend freebsd,!ebitencbackend openbsd,!ebitencbackend pkg-config: gl +#cgo linux,!ebitenginecbackend && !ebitencbackend freebsd,!ebitencbackend openbsd,!ebitencbackend pkg-config: gl #cgo egl CFLAGS: -DTAG_EGL -#cgo egl,!ebitencbackend pkg-config: egl -#cgo ebitencbackend LDFLAGS: -Wl,-unresolved-symbols=ignore-all +#cgo egl,!ebitenginecbackend && !ebitencbackend pkg-config: egl +#cgo ebitenginecbackend || ebitencbackend LDFLAGS: -Wl,-unresolved-symbols=ignore-all // Check the EGL tag first as it takes priority over the platform's default // configuration of WGL/GLX/CGL. #if defined(TAG_EGL) diff --git a/internal/ui/hideconsole_notwindows.go b/internal/ui/hideconsole_notwindows.go index ed82e15fc..dd29004a3 100644 --- a/internal/ui/hideconsole_notwindows.go +++ b/internal/ui/hideconsole_notwindows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !windows || ebitencbackend -// +build !windows ebitencbackend +//go:build !windows || ebitenginecbackend || ebitencbackend +// +build !windows ebitenginecbackend ebitencbackend package ui diff --git a/internal/ui/hideconsole_windows.go b/internal/ui/hideconsole_windows.go index 1179cc5fa..fc8959b47 100644 --- a/internal/ui/hideconsole_windows.go +++ b/internal/ui/hideconsole_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/ui/input_cbackend.go b/internal/ui/input_cbackend.go index e911f0c44..7da0f4130 100644 --- a/internal/ui/input_cbackend.go +++ b/internal/ui/input_cbackend.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitencbackend -// +build ebitencbackend +//go:build ebitenginecbackend || ebitencbackend +// +build ebitenginecbackend ebitencbackend package ui diff --git a/internal/ui/input_glfw.go b/internal/ui/input_glfw.go index 2a75b3f09..d94099c5c 100644 --- a/internal/ui/input_glfw.go +++ b/internal/ui/input_glfw.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitencbackend -// +build !android,!ios,!js,!ebitencbackend +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend +// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/ui/input_mobile.go b/internal/ui/input_mobile.go index 3dc88900f..73b191c27 100644 --- a/internal/ui/input_mobile.go +++ b/internal/ui/input_mobile.go @@ -12,8 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (android || ios) && !ebitencbackend +//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend // +build android ios +// +build !ebitenginecbackend // +build !ebitencbackend package ui diff --git a/internal/ui/keys_glfw.go b/internal/ui/keys_glfw.go index 90c9e0f38..97eaf6b61 100644 --- a/internal/ui/keys_glfw.go +++ b/internal/ui/keys_glfw.go @@ -14,8 +14,8 @@ // Code generated by genkeys.go using 'go generate'. DO NOT EDIT. -//go:build !android && !ios && !js && !ebitencbackend -// +build !android,!ios,!js,!ebitencbackend +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend +// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/ui/keys_mobile.go b/internal/ui/keys_mobile.go index 450a5d309..825ed22fb 100644 --- a/internal/ui/keys_mobile.go +++ b/internal/ui/keys_mobile.go @@ -14,8 +14,9 @@ // Code generated by genkeys.go using 'go generate'. DO NOT EDIT. -//go:build (android || ios) && !ebitencbackend +//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend // +build android ios +// +build !ebitenginecbackend // +build !ebitencbackend package ui diff --git a/internal/ui/run_notsinglethread.go b/internal/ui/run_notsinglethread.go index 1bedfbb59..aa5a8f723 100644 --- a/internal/ui/run_notsinglethread.go +++ b/internal/ui/run_notsinglethread.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitencbackend && !ebitensinglethread -// +build !android,!ios,!js,!ebitencbackend,!ebitensinglethread +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend && !ebitensinglethread +// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend,!ebitensinglethread package ui diff --git a/internal/ui/run_singlethread.go b/internal/ui/run_singlethread.go index c5ab2a6a0..37dfaa3bc 100644 --- a/internal/ui/run_singlethread.go +++ b/internal/ui/run_singlethread.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitencbackend && ebitensinglethread -// +build !android,!ios,!js,!ebitencbackend,ebitensinglethread +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend && ebitensinglethread +// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend,ebitensinglethread package ui diff --git a/internal/ui/ui_cbackend.go b/internal/ui/ui_cbackend.go index 769eecbdb..b9518de14 100644 --- a/internal/ui/ui_cbackend.go +++ b/internal/ui/ui_cbackend.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitencbackend -// +build ebitencbackend +//go:build ebitenginecbackend || ebitencbackend +// +build ebitenginecbackend ebitencbackend package ui diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go index 2a0245623..a2d949b6d 100644 --- a/internal/ui/ui_glfw.go +++ b/internal/ui/ui_glfw.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitencbackend -// +build !android,!ios,!js,!ebitencbackend +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend +// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/ui/ui_glfw_darwin.go b/internal/ui/ui_glfw_darwin.go index 2ba85bf39..18ef7174c 100644 --- a/internal/ui/ui_glfw_darwin.go +++ b/internal/ui/ui_glfw_darwin.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ios && !ebitencbackend -// +build !ios,!ebitencbackend +//go:build !ios && !ebitenginecbackend && !ebitencbackend +// +build !ios,!ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/ui/ui_glfw_unix.go b/internal/ui/ui_glfw_unix.go index 0ee5e065f..0f2a482a6 100644 --- a/internal/ui/ui_glfw_unix.go +++ b/internal/ui/ui_glfw_unix.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !darwin && !js && !windows && !ebitencbackend -// +build !android,!darwin,!js,!windows,!ebitencbackend +//go:build !android && !darwin && !js && !windows && !ebitenginecbackend && !ebitencbackend +// +build !android,!darwin,!js,!windows,!ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/ui/ui_glfw_windows.go b/internal/ui/ui_glfw_windows.go index f3e8ff894..2f6ff6e3a 100644 --- a/internal/ui/ui_glfw_windows.go +++ b/internal/ui/ui_glfw_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/ui/ui_mobile.go b/internal/ui/ui_mobile.go index 25762054c..c8e52acbc 100644 --- a/internal/ui/ui_mobile.go +++ b/internal/ui/ui_mobile.go @@ -12,8 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (android || ios) && !ebitencbackend +//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend // +build android ios +// +build !ebitenginecbackend // +build !ebitencbackend package ui diff --git a/internal/ui/window_glfw.go b/internal/ui/window_glfw.go index 383d6acf9..a7e6eea20 100644 --- a/internal/ui/window_glfw.go +++ b/internal/ui/window_glfw.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitencbackend -// +build !android,!ios,!js,!ebitencbackend +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend +// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend package ui diff --git a/internal/vibrate/vibrate_android.go b/internal/vibrate/vibrate_android.go index 56023b43a..4cb8091f3 100644 --- a/internal/vibrate/vibrate_android.go +++ b/internal/vibrate/vibrate_android.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitencbackend -// +build !ebitencbackend +//go:build !ebitenginecbackend && !ebitencbackend +// +build !ebitenginecbackend,!ebitencbackend package vibrate diff --git a/internal/vibrate/vibrate_ios.go b/internal/vibrate/vibrate_ios.go index b01f86fd9..5348b6170 100644 --- a/internal/vibrate/vibrate_ios.go +++ b/internal/vibrate/vibrate_ios.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ios && !ebitencbackend -// +build ios,!ebitencbackend +//go:build ios && !ebitenginecbackend && !ebitencbackend +// +build ios,!ebitenginecbackend,!ebitencbackend package vibrate diff --git a/internal/vibrate/vibrate_null.go b/internal/vibrate/vibrate_null.go index bda302dfc..d7254f1db 100644 --- a/internal/vibrate/vibrate_null.go +++ b/internal/vibrate/vibrate_null.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (!android && !ios && !js) || ebitencbackend -// +build !android,!ios,!js ebitencbackend +//go:build (!android && !ios && !js) || ebitenginecbackend || ebitencbackend +// +build !android,!ios,!js ebitenginecbackend ebitencbackend package vibrate