diff --git a/audio/context_cbackend.go b/audio/context_cbackend.go index 7b1442f60..b4392819d 100644 --- a/audio/context_cbackend.go +++ b/audio/context_cbackend.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitenginecbackend || ebitencbackend -// +build ebitenginecbackend ebitencbackend +//go:build nintendosdk || ebitencbackend +// +build nintendosdk ebitencbackend package audio diff --git a/audio/context_oto.go b/audio/context_oto.go index f4e4d3b87..58e99482d 100644 --- a/audio/context_oto.go +++ b/audio/context_oto.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package audio diff --git a/genkeys.go b/genkeys.go index 92676f1d0..541e97e5a 100644 --- a/genkeys.go +++ b/genkeys.go @@ -825,12 +825,12 @@ func main() { buildTag = "//go:build !js" + "\n// +build !js" case filepath.Join("internal", "ui", "keys_mobile.go"): - buildTag = "//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend" + + buildTag = "//go:build (android || ios) && !nintendosdk && !ebitencbackend" + "\n// +build android ios" + - "\n// +build !ebitenginecbackend && !ebitencbackend" + "\n// +build !nintendosdk && !ebitencbackend" case filepath.Join("internal", "ui", "keys_glfw.go"): - buildTag = "//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend" + - "\n// +build !android,!ios,!js,!ebitenginecbackend && !ebitencbackend" + buildTag = "//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend" + + "\n// +build !android,!ios,!js,!nintendosdk && !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 d831136b1..b930b966e 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 ebitenginecbackend || ebitencbackend -// +build ebitenginecbackend ebitencbackend +//go:build nintendosdk || ebitencbackend +// +build nintendosdk ebitencbackend package cbackend diff --git a/internal/gamepad/api_desktop_windows.go b/internal/gamepad/api_desktop_windows.go index c6353d62f..7718b2478 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/api_ios.go b/internal/gamepad/api_ios.go index d44c72ff8..8bb1ce8b4 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 && !ebitenginecbackend && !ebitencbackend -// +build ios,!ebitenginecbackend,!ebitencbackend +//go:build ios && !nintendosdk && !ebitencbackend +// +build ios,!nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/api_linux.go b/internal/gamepad/api_linux.go index 2de875dee..1f787a050 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 && !ebitenginecbackend && !ebitencbackend -// +build !android,!ebitenginecbackend,!ebitencbackend +//go:build !android && !nintendosdk && !ebitencbackend +// +build !android,!nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/api_xbox_windows.go b/internal/gamepad/api_xbox_windows.go index 5f944a4a0..63fb160d7 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/extern_android.go b/internal/gamepad/extern_android.go index ea668b40a..f2d3115ab 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_android.go b/internal/gamepad/gamepad_android.go index 251bab1c2..b3deda1ac 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_cbackend.go b/internal/gamepad/gamepad_cbackend.go index 7680adc32..68017cbfc 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 ebitenginecbackend || ebitencbackend -// +build ebitenginecbackend ebitencbackend +//go:build nintendosdk || ebitencbackend +// +build nintendosdk ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_darwin.go b/internal/gamepad/gamepad_darwin.go index a3018905e..877425089 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 && !ebitenginecbackend && !ebitencbackend -// +build !ios,!ebitenginecbackend,!ebitencbackend +//go:build !ios && !nintendosdk && !ebitencbackend +// +build !ios,!nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_desktop_windows.go b/internal/gamepad/gamepad_desktop_windows.go index 5559436cf..8e803157e 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_ios.go b/internal/gamepad/gamepad_ios.go index a66857b08..d9071faae 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 && !ebitenginecbackend && !ebitencbackend -// +build ios,!ebitenginecbackend,!ebitencbackend +//go:build ios && !nintendosdk && !ebitencbackend +// +build ios,!nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_linux.go b/internal/gamepad/gamepad_linux.go index c9bc6b0ad..9ecbcdf15 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 && !ebitenginecbackend && !ebitencbackend -// +build !android,!ebitenginecbackend,!ebitencbackend +//go:build !android && !nintendosdk && !ebitencbackend +// +build !android,!nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_windows.go b/internal/gamepad/gamepad_windows.go index e82b9d6c6..7f478bca1 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package gamepad diff --git a/internal/gamepad/gamepad_xbox_windows.go b/internal/gamepad/gamepad_xbox_windows.go index 88f474441..d3811f21c 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package gamepad diff --git a/internal/graphicsdriver/opengl/gl/package_others.go b/internal/graphicsdriver/opengl/gl/package_others.go index faa12ba5b..cda31fbcc 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,!ebitenginecbackend,!ebitencbackend freebsd,!ebitenginecbackend,!ebitencbackend openbsd,!ebitenginecbackend,!ebitencbackend pkg-config: gl +// #cgo linux,!nintendosdk,!ebitencbackend freebsd,!nintendosdk,!ebitencbackend openbsd,!nintendosdk,!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 e92de7e4b..9b6c68685 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,!ebitenginecbackend,!ebitencbackend freebsd,!ebitenginecbackend,!ebitencbackend openbsd,!ebitenginecbackend,!ebitencbackend pkg-config: gl +#cgo linux,!nintendosdk,!ebitencbackend freebsd,!nintendosdk,!ebitencbackend openbsd,!nintendosdk,!ebitencbackend pkg-config: gl #cgo egl CFLAGS: -DTAG_EGL -#cgo egl,!ebitenginecbackend,!ebitencbackend pkg-config: egl -#cgo ebitenginecbackend ebitencbackend LDFLAGS: -Wl,-unresolved-symbols=ignore-all +#cgo egl,!nintendosdk,!ebitencbackend pkg-config: egl +#cgo nintendosdk 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. diff --git a/internal/ui/api_windows.go b/internal/ui/api_windows.go index 57a7a709b..a6043ac4a 100644 --- a/internal/ui/api_windows.go +++ b/internal/ui/api_windows.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/hideconsole_notwindows.go b/internal/ui/hideconsole_notwindows.go index dd29004a3..c51e2c1b4 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 || ebitenginecbackend || ebitencbackend -// +build !windows ebitenginecbackend ebitencbackend +//go:build !windows || nintendosdk || ebitencbackend +// +build !windows nintendosdk ebitencbackend package ui diff --git a/internal/ui/hideconsole_windows.go b/internal/ui/hideconsole_windows.go index fc8959b47..a9b454357 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/input_cbackend.go b/internal/ui/input_cbackend.go index 7da0f4130..91334c00d 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 ebitenginecbackend || ebitencbackend -// +build ebitenginecbackend ebitencbackend +//go:build nintendosdk || ebitencbackend +// +build nintendosdk ebitencbackend package ui diff --git a/internal/ui/input_glfw.go b/internal/ui/input_glfw.go index c26d385f9..ef3041bf4 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 && !ebitenginecbackend && !ebitencbackend -// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend +// +build !android,!ios,!js,!nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/input_mobile.go b/internal/ui/input_mobile.go index 73b191c27..a6d8de292 100644 --- a/internal/ui/input_mobile.go +++ b/internal/ui/input_mobile.go @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend +//go:build (android || ios) && !nintendosdk && !ebitencbackend // +build android ios -// +build !ebitenginecbackend +// +build !nintendosdk // +build !ebitencbackend package ui diff --git a/internal/ui/keys_glfw.go b/internal/ui/keys_glfw.go index 1462637d3..8e0bf2d0a 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 && !ebitenginecbackend && !ebitencbackend -// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend +// +build !android,!ios,!js,!nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/keys_mobile.go b/internal/ui/keys_mobile.go index 825ed22fb..099879225 100644 --- a/internal/ui/keys_mobile.go +++ b/internal/ui/keys_mobile.go @@ -14,9 +14,9 @@ // Code generated by genkeys.go using 'go generate'. DO NOT EDIT. -//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend +//go:build (android || ios) && !nintendosdk && !ebitencbackend // +build android ios -// +build !ebitenginecbackend +// +build !nintendosdk // +build !ebitencbackend package ui diff --git a/internal/ui/run_notsinglethread.go b/internal/ui/run_notsinglethread.go index 32def1457..7273586e8 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 && !ebitenginecbackend && !ebitencbackend && !ebitenginesinglethread && !ebitensinglethread -// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend,!ebitenginesinglethread,!ebitensinglethread +//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend && !ebitenginesinglethread && !ebitensinglethread +// +build !android,!ios,!js,!nintendosdk,!ebitencbackend,!ebitenginesinglethread,!ebitensinglethread package ui diff --git a/internal/ui/run_singlethread.go b/internal/ui/run_singlethread.go index 925116ea4..ad51977c1 100644 --- a/internal/ui/run_singlethread.go +++ b/internal/ui/run_singlethread.go @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend && (ebitenginesinglethread || ebitensinglethread) +//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend && (ebitenginesinglethread || ebitensinglethread) // +build !android // +build !ios // +build !js -// +build !ebitenginecbackend +// +build !nintendosdk // +build !ebitencbackend // +build ebitenginesinglethread ebitensinglethread diff --git a/internal/ui/ui_cbackend.go b/internal/ui/ui_cbackend.go index 2ce09c72c..5677ae539 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 ebitenginecbackend || ebitencbackend -// +build ebitenginecbackend ebitencbackend +//go:build nintendosdk || ebitencbackend +// +build nintendosdk ebitencbackend package ui diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go index 38a4ae791..8d9881570 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 && !ebitenginecbackend && !ebitencbackend -// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend +// +build !android,!ios,!js,!nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/ui_glfw_darwin.go b/internal/ui/ui_glfw_darwin.go index 7a7220491..510d2ff0c 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 && !ebitenginecbackend && !ebitencbackend -// +build !ios,!ebitenginecbackend,!ebitencbackend +//go:build !ios && !nintendosdk && !ebitencbackend +// +build !ios,!nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/ui_glfw_unix.go b/internal/ui/ui_glfw_unix.go index a4f422085..8bfd2451c 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 && !ebitenginecbackend && !ebitencbackend -// +build !android,!darwin,!js,!windows,!ebitenginecbackend,!ebitencbackend +//go:build !android && !darwin && !js && !windows && !nintendosdk && !ebitencbackend +// +build !android,!darwin,!js,!windows,!nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/ui_glfw_windows.go b/internal/ui/ui_glfw_windows.go index 66bbe5248..cb69c2088 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package ui diff --git a/internal/ui/ui_mobile.go b/internal/ui/ui_mobile.go index c8e52acbc..33250b680 100644 --- a/internal/ui/ui_mobile.go +++ b/internal/ui/ui_mobile.go @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (android || ios) && !ebitenginecbackend && !ebitencbackend +//go:build (android || ios) && !nintendosdk && !ebitencbackend // +build android ios -// +build !ebitenginecbackend +// +build !nintendosdk // +build !ebitencbackend package ui diff --git a/internal/ui/window_glfw.go b/internal/ui/window_glfw.go index 1d0bec5e6..1212dd3b4 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 && !ebitenginecbackend && !ebitencbackend -// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend +// +build !android,!ios,!js,!nintendosdk,!ebitencbackend package ui diff --git a/internal/vibrate/vibrate_android.go b/internal/vibrate/vibrate_android.go index 4cb8091f3..7dd0a17e8 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 !ebitenginecbackend && !ebitencbackend -// +build !ebitenginecbackend,!ebitencbackend +//go:build !nintendosdk && !ebitencbackend +// +build !nintendosdk,!ebitencbackend package vibrate diff --git a/internal/vibrate/vibrate_ios.go b/internal/vibrate/vibrate_ios.go index 5348b6170..bbde5e501 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 && !ebitenginecbackend && !ebitencbackend -// +build ios,!ebitenginecbackend,!ebitencbackend +//go:build ios && !nintendosdk && !ebitencbackend +// +build ios,!nintendosdk,!ebitencbackend package vibrate diff --git a/internal/vibrate/vibrate_null.go b/internal/vibrate/vibrate_null.go index d7254f1db..73ee7c77f 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) || ebitenginecbackend || ebitencbackend -// +build !android,!ios,!js ebitenginecbackend ebitencbackend +//go:build (!android && !ios && !js) || nintendosdk || ebitencbackend +// +build !android,!ios,!js nintendosdk ebitencbackend package vibrate