add ebitenginecbackend build tag besides ebitencbackend

Updates #2111
Updates #2190

.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)

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
 

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.

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
 

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
 

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
 

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
 

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 {

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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)

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
 

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
 

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
 

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
 

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

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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