diff --git a/audio/context_cbackend.go b/audio/context_nintendosdk.go similarity index 94% rename from audio/context_cbackend.go rename to audio/context_nintendosdk.go index b4392819d..e557108f0 100644 --- a/audio/context_cbackend.go +++ b/audio/context_nintendosdk.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build nintendosdk || ebitencbackend -// +build nintendosdk ebitencbackend +//go:build nintendosdk +// +build nintendosdk package audio diff --git a/audio/context_oto.go b/audio/context_oto.go index 58e99482d..c0891a36e 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package audio diff --git a/doc.go b/doc.go index d6d6cf13d..3715e4f81 100644 --- a/doc.go +++ b/doc.go @@ -93,5 +93,7 @@ // They must be called from the main thread or the same goroutine as the given game's callback functions like Update // to RunGame. // -// `microsoftgdk` is for Microsoft GDK (Xbox). +// `microsoftgdk` is for Microsoft GDK (e.g. Xbox). +// +// `nintendosdk` is for NintendoSDK (e.g. Nintendo Switch). package ebiten diff --git a/examples/flappy/main_c.go b/examples/flappy/main_c.go index 50e1c5919..f7b27ed77 100644 --- a/examples/flappy/main_c.go +++ b/examples/flappy/main_c.go @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build example && (ebitencbackend || (windows && cgo)) +//go:build example && (nintendosdk || microsoftgdk) // +build example -// +build ebitencbackend windows,cgo +// +build nintendosdk microsoftgdk -// This file is for some special environments using `ebitencbackend`. +// This file is for some special environments using 'nintendosdk' or 'microsoftgdk'. // You usually don't have to care about this file. // Actually this example works without this file in usual cases. diff --git a/genkeys.go b/genkeys.go index d36ca4af9..7d81c891e 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) && !nintendosdk && !ebitencbackend" + + buildTag = "//go:build (android || ios) && !nintendosdk" + "\n// +build android ios" + - "\n// +build !nintendosdk,!ebitencbackend" + "\n// +build !nintendosdk" case filepath.Join("internal", "ui", "keys_glfw.go"): - buildTag = "//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend" + - "\n// +build !android,!ios,!js,!nintendosdk,!ebitencbackend" + buildTag = "//go:build !android && !ios && !js && !nintendosdk" + + "\n// +build !android,!ios,!js,!nintendosdk" } // 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 b930b966e..368dc8307 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 nintendosdk || ebitencbackend -// +build nintendosdk ebitencbackend +//go:build nintendosdk +// +build nintendosdk package cbackend diff --git a/internal/gamepad/api_desktop_windows.go b/internal/gamepad/api_desktop_windows.go index 7718b2478..6961a87b9 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package gamepad diff --git a/internal/gamepad/api_ios.go b/internal/gamepad/api_ios.go index 8bb1ce8b4..6e7d05029 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 && !nintendosdk && !ebitencbackend -// +build ios,!nintendosdk,!ebitencbackend +//go:build ios && !nintendosdk +// +build ios,!nintendosdk package gamepad diff --git a/internal/gamepad/api_linux.go b/internal/gamepad/api_linux.go index 1f787a050..2d8cebc40 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 && !nintendosdk && !ebitencbackend -// +build !android,!nintendosdk,!ebitencbackend +//go:build !android && !nintendosdk +// +build !android,!nintendosdk package gamepad diff --git a/internal/gamepad/api_xbox_windows.go b/internal/gamepad/api_xbox_windows.go index 63fb160d7..a930a4eb8 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package gamepad diff --git a/internal/gamepad/extern_android.go b/internal/gamepad/extern_android.go index f2d3115ab..01bec00eb 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_android.go b/internal/gamepad/gamepad_android.go index b3deda1ac..ebd02c673 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_darwin.go b/internal/gamepad/gamepad_darwin.go index 877425089..c930da2c3 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 && !nintendosdk && !ebitencbackend -// +build !ios,!nintendosdk,!ebitencbackend +//go:build !ios && !nintendosdk +// +build !ios,!nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_desktop_windows.go b/internal/gamepad/gamepad_desktop_windows.go index 8e803157e..ea4dcf00c 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_ios.go b/internal/gamepad/gamepad_ios.go index d9071faae..aebd1debd 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 && !nintendosdk && !ebitencbackend -// +build ios,!nintendosdk,!ebitencbackend +//go:build ios && !nintendosdk +// +build ios,!nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_linux.go b/internal/gamepad/gamepad_linux.go index 9ecbcdf15..e2f3f80f1 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 && !nintendosdk && !ebitencbackend -// +build !android,!nintendosdk,!ebitencbackend +//go:build !android && !nintendosdk +// +build !android,!nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_cbackend.go b/internal/gamepad/gamepad_nintendosdk.go similarity index 97% rename from internal/gamepad/gamepad_cbackend.go rename to internal/gamepad/gamepad_nintendosdk.go index 68017cbfc..998c22185 100644 --- a/internal/gamepad/gamepad_cbackend.go +++ b/internal/gamepad/gamepad_nintendosdk.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build nintendosdk || ebitencbackend -// +build nintendosdk ebitencbackend +//go:build nintendosdk +// +build nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_windows.go b/internal/gamepad/gamepad_windows.go index 7f478bca1..7cf49415f 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package gamepad diff --git a/internal/gamepad/gamepad_xbox_windows.go b/internal/gamepad/gamepad_xbox_windows.go index d3811f21c..3d7c214eb 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package gamepad diff --git a/internal/graphicsdriver/opengl/gl/package_others.go b/internal/graphicsdriver/opengl/gl/package_others.go index cda31fbcc..4900b595d 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,!nintendosdk,!ebitencbackend freebsd,!nintendosdk,!ebitencbackend openbsd,!nintendosdk,!ebitencbackend pkg-config: gl +// #cgo linux,!nintendosdk freebsd,!nintendosdk openbsd,!nintendosdk 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 9b6c68685..d3309f8c1 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,!nintendosdk,!ebitencbackend freebsd,!nintendosdk,!ebitencbackend openbsd,!nintendosdk,!ebitencbackend pkg-config: gl -#cgo egl CFLAGS: -DTAG_EGL -#cgo egl,!nintendosdk,!ebitencbackend pkg-config: egl -#cgo nintendosdk ebitencbackend LDFLAGS: -Wl,-unresolved-symbols=ignore-all +#cgo linux,!nintendosdk freebsd,!nintendosdk openbsd,!nintendosdk pkg-config: gl +#cgo egl nintendosdk CFLAGS: -DTAG_EGL +#cgo egl,!nintendosdk pkg-config: egl +#cgo nintendosdk 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 a6043ac4a..70ced6c13 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package ui diff --git a/internal/ui/hideconsole_notwindows.go b/internal/ui/hideconsole_notwindows.go index c51e2c1b4..06a9bd06a 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 || nintendosdk || ebitencbackend -// +build !windows nintendosdk ebitencbackend +//go:build !windows || nintendosdk +// +build !windows nintendosdk package ui diff --git a/internal/ui/hideconsole_windows.go b/internal/ui/hideconsole_windows.go index a9b454357..b265a8394 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package ui diff --git a/internal/ui/input_glfw.go b/internal/ui/input_glfw.go index ef3041bf4..ceb1e61c5 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 && !nintendosdk && !ebitencbackend -// +build !android,!ios,!js,!nintendosdk,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk +// +build !android,!ios,!js,!nintendosdk package ui diff --git a/internal/ui/input_mobile.go b/internal/ui/input_mobile.go index a6d8de292..1973fbc8b 100644 --- a/internal/ui/input_mobile.go +++ b/internal/ui/input_mobile.go @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (android || ios) && !nintendosdk && !ebitencbackend +//go:build (android || ios) && !nintendosdk // +build android ios // +build !nintendosdk -// +build !ebitencbackend package ui diff --git a/internal/ui/input_cbackend.go b/internal/ui/input_nintendosdk.go similarity index 96% rename from internal/ui/input_cbackend.go rename to internal/ui/input_nintendosdk.go index 91334c00d..c2b02a157 100644 --- a/internal/ui/input_cbackend.go +++ b/internal/ui/input_nintendosdk.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build nintendosdk || ebitencbackend -// +build nintendosdk ebitencbackend +//go:build nintendosdk +// +build nintendosdk package ui diff --git a/internal/ui/keys_glfw.go b/internal/ui/keys_glfw.go index 8e0bf2d0a..57d024f91 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 && !nintendosdk && !ebitencbackend -// +build !android,!ios,!js,!nintendosdk,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk +// +build !android,!ios,!js,!nintendosdk package ui diff --git a/internal/ui/keys_mobile.go b/internal/ui/keys_mobile.go index 099879225..4728021b6 100644 --- a/internal/ui/keys_mobile.go +++ b/internal/ui/keys_mobile.go @@ -14,10 +14,9 @@ // Code generated by genkeys.go using 'go generate'. DO NOT EDIT. -//go:build (android || ios) && !nintendosdk && !ebitencbackend +//go:build (android || ios) && !nintendosdk // +build android ios // +build !nintendosdk -// +build !ebitencbackend package ui diff --git a/internal/ui/run_notsinglethread.go b/internal/ui/run_notsinglethread.go index 7273586e8..76f032433 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 && !nintendosdk && !ebitencbackend && !ebitenginesinglethread && !ebitensinglethread -// +build !android,!ios,!js,!nintendosdk,!ebitencbackend,!ebitenginesinglethread,!ebitensinglethread +//go:build !android && !ios && !js && !nintendosdk && !ebitenginesinglethread && !ebitensinglethread +// +build !android,!ios,!js,!nintendosdk,!ebitenginesinglethread,!ebitensinglethread package ui diff --git a/internal/ui/run_singlethread.go b/internal/ui/run_singlethread.go index ad51977c1..cbac47a93 100644 --- a/internal/ui/run_singlethread.go +++ b/internal/ui/run_singlethread.go @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !nintendosdk && !ebitencbackend && (ebitenginesinglethread || ebitensinglethread) +//go:build !android && !ios && !js && !nintendosdk && (ebitenginesinglethread || ebitensinglethread) // +build !android // +build !ios // +build !js // +build !nintendosdk -// +build !ebitencbackend // +build ebitenginesinglethread ebitensinglethread package ui diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go index 8d9881570..1a7e2f696 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 && !nintendosdk && !ebitencbackend -// +build !android,!ios,!js,!nintendosdk,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk +// +build !android,!ios,!js,!nintendosdk package ui diff --git a/internal/ui/ui_glfw_darwin.go b/internal/ui/ui_glfw_darwin.go index 510d2ff0c..23101f4ba 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 && !nintendosdk && !ebitencbackend -// +build !ios,!nintendosdk,!ebitencbackend +//go:build !ios && !nintendosdk +// +build !ios,!nintendosdk package ui diff --git a/internal/ui/ui_glfw_unix.go b/internal/ui/ui_glfw_unix.go index 8bfd2451c..3ded868d7 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 && !nintendosdk && !ebitencbackend -// +build !android,!darwin,!js,!windows,!nintendosdk,!ebitencbackend +//go:build !android && !darwin && !js && !windows && !nintendosdk +// +build !android,!darwin,!js,!windows,!nintendosdk package ui diff --git a/internal/ui/ui_glfw_windows.go b/internal/ui/ui_glfw_windows.go index cb69c2088..2bbceb842 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package ui diff --git a/internal/ui/ui_mobile.go b/internal/ui/ui_mobile.go index 33250b680..f68a57b7d 100644 --- a/internal/ui/ui_mobile.go +++ b/internal/ui/ui_mobile.go @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (android || ios) && !nintendosdk && !ebitencbackend +//go:build (android || ios) && !nintendosdk // +build android ios // +build !nintendosdk -// +build !ebitencbackend package ui diff --git a/internal/ui/ui_cbackend.go b/internal/ui/ui_nintendosdk.go similarity index 97% rename from internal/ui/ui_cbackend.go rename to internal/ui/ui_nintendosdk.go index 5677ae539..85f06d77e 100644 --- a/internal/ui/ui_cbackend.go +++ b/internal/ui/ui_nintendosdk.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build nintendosdk || ebitencbackend -// +build nintendosdk ebitencbackend +//go:build nintendosdk +// +build nintendosdk package ui diff --git a/internal/ui/window_glfw.go b/internal/ui/window_glfw.go index 1212dd3b4..1ae3d4932 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 && !nintendosdk && !ebitencbackend -// +build !android,!ios,!js,!nintendosdk,!ebitencbackend +//go:build !android && !ios && !js && !nintendosdk +// +build !android,!ios,!js,!nintendosdk package ui diff --git a/internal/vibrate/vibrate_android.go b/internal/vibrate/vibrate_android.go index 7dd0a17e8..6be434440 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 !nintendosdk && !ebitencbackend -// +build !nintendosdk,!ebitencbackend +//go:build !nintendosdk +// +build !nintendosdk package vibrate diff --git a/internal/vibrate/vibrate_ios.go b/internal/vibrate/vibrate_ios.go index bbde5e501..1a0ff0f28 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 && !nintendosdk && !ebitencbackend -// +build ios,!nintendosdk,!ebitencbackend +//go:build ios && !nintendosdk +// +build ios,!nintendosdk package vibrate diff --git a/internal/vibrate/vibrate_null.go b/internal/vibrate/vibrate_null.go index 73ee7c77f..0fe2a371c 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) || nintendosdk || ebitencbackend -// +build !android,!ios,!js nintendosdk ebitencbackend +//go:build (!android && !ios && !js) || nintendosdk +// +build !android,!ios,!js nintendosdk package vibrate