diff --git a/ebitenutil/file_notjs.go b/ebitenutil/file_notjs.go index e76f652d4..7f2dfa843 100644 --- a/ebitenutil/file_notjs.go +++ b/ebitenutil/file_notjs.go @@ -12,11 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (darwin || freebsd || linux || windows) && !js && !android && !ios -// +build darwin freebsd linux windows -// +build !js -// +build !android -// +build !ios +//go:build !android && !js && !ios +// +build !android,!js,!ios package ebitenutil diff --git a/ebitenutil/loadimage.go b/ebitenutil/loadimage.go index 8c4751fda..9602d4f7c 100644 --- a/ebitenutil/loadimage.go +++ b/ebitenutil/loadimage.go @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (darwin || freebsd || js || linux || windows) && !android && !ios -// +build darwin freebsd js linux windows -// +build !android -// +build !ios +//go:build !android && !ios +// +build !android,!ios package ebitenutil diff --git a/genkeys.go b/genkeys.go index b2d0c0dad..67e6f3dc6 100644 --- a/genkeys.go +++ b/genkeys.go @@ -818,10 +818,8 @@ func main() { buildTag = "//go:build !js" + "\n// +build !js" case filepath.Join("internal", "uidriver", "glfw", "keys.go"): - buildTag = "//go:build (darwin || freebsd || linux || windows) && !android && !ios" + - "\n// +build darwin freebsd linux windows" + - "\n// +build !android" + - "\n// +build !ios" + buildTag = "//go:build !android && !js && !ios" + + "\n// +build !android,!js,!ios" } // NOTE: According to godoc, maps are automatically sorted by key. if err := tmpl.Execute(f, struct { diff --git a/internal/graphicsdriver/opengl/context_desktop.go b/internal/graphicsdriver/opengl/context_desktop.go index 4e08c610c..1aee657fe 100644 --- a/internal/graphicsdriver/opengl/context_desktop.go +++ b/internal/graphicsdriver/opengl/context_desktop.go @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (darwin || freebsd || linux || windows) && !android && !ios -// +build darwin freebsd linux windows -// +build !android -// +build !ios +//go:build !android && !js && !ios +// +build !android,!js,!ios package opengl diff --git a/internal/uidriver/glfw/graphics_opengl.go b/internal/uidriver/glfw/graphics_opengl.go index 995f8f08e..e7dca753c 100644 --- a/internal/uidriver/glfw/graphics_opengl.go +++ b/internal/uidriver/glfw/graphics_opengl.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build freebsd || linux || windows || ebitengl -// +build freebsd linux windows ebitengl +//go:build !android && !js && !ios +// +build !android,!js,!ios package glfw diff --git a/internal/uidriver/glfw/input.go b/internal/uidriver/glfw/input.go index f4725cfd6..601dfce4e 100644 --- a/internal/uidriver/glfw/input.go +++ b/internal/uidriver/glfw/input.go @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (darwin || freebsd || linux || windows) && !android && !ios -// +build darwin freebsd linux windows -// +build !android -// +build !ios +//go:build !android && !js && !ios +// +build !android,!js,!ios //go:generate curl --location --remote-name https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt //go:generate file2byteslice -package glfw -input=./gamecontrollerdb.txt -output=./gamecontrollerdb.txt.go -var=gamecontrollerdbTxt diff --git a/internal/uidriver/glfw/keys.go b/internal/uidriver/glfw/keys.go index a25a00524..f24018544 100644 --- a/internal/uidriver/glfw/keys.go +++ b/internal/uidriver/glfw/keys.go @@ -14,10 +14,8 @@ // Code generated by genkeys.go using 'go generate'. DO NOT EDIT. -//go:build (darwin || freebsd || linux || windows) && !android && !ios -// +build darwin freebsd linux windows -// +build !android -// +build !ios +//go:build !android && !js && !ios +// +build !android,!js,!ios package glfw diff --git a/internal/uidriver/glfw/run_notsinglethread.go b/internal/uidriver/glfw/run_notsinglethread.go index b45c9c2fc..9e2586564 100644 --- a/internal/uidriver/glfw/run_notsinglethread.go +++ b/internal/uidriver/glfw/run_notsinglethread.go @@ -12,11 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitensinglethread && (darwin || freebsd || linux || windows) && !android && !ios -// +build !ebitensinglethread -// +build darwin freebsd linux windows -// +build !android -// +build !ios +//go:build !ebitensinglethread && !android && !js && !ios +// +build !ebitensinglethread,!android,!js,!ios package glfw diff --git a/internal/uidriver/glfw/run_singlethread.go b/internal/uidriver/glfw/run_singlethread.go index 6eb64e342..799bd2d02 100644 --- a/internal/uidriver/glfw/run_singlethread.go +++ b/internal/uidriver/glfw/run_singlethread.go @@ -12,11 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitensinglethread && (darwin || freebsd || linux || windows) && !android && !ios -// +build ebitensinglethread -// +build darwin freebsd linux windows -// +build !android -// +build !ios +//go:build ebitensinglethread && !android && !js && !ios +// +build ebitensinglethread,!android,!js,!ios package glfw diff --git a/internal/uidriver/glfw/ui.go b/internal/uidriver/glfw/ui.go index 97ba24de7..977754155 100644 --- a/internal/uidriver/glfw/ui.go +++ b/internal/uidriver/glfw/ui.go @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (darwin || freebsd || linux || windows) && !android && !ios -// +build darwin freebsd linux windows -// +build !android -// +build !ios +//go:build !android && !js && !ios +// +build !android,!js,!ios package glfw diff --git a/internal/uidriver/glfw/ui_unix.go b/internal/uidriver/glfw/ui_unix.go index 73a1a8c85..581d06180 100644 --- a/internal/uidriver/glfw/ui_unix.go +++ b/internal/uidriver/glfw/ui_unix.go @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !android -// +build dragonfly freebsd linux netbsd openbsd solaris -// +build !android +//go:build !android && !darwin && !js && !ios && !windows +// +build !android,!darwin,!js,!ios,!windows package glfw diff --git a/internal/uidriver/glfw/window.go b/internal/uidriver/glfw/window.go index 0ee56e05d..7ad703627 100644 --- a/internal/uidriver/glfw/window.go +++ b/internal/uidriver/glfw/window.go @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (darwin || freebsd || linux || windows) && !android && !ios -// +build darwin freebsd linux windows -// +build !android -// +build !ios +//go:build !android && !js && !ios +// +build !android,!js,!ios package glfw diff --git a/uidriver_glfw.go b/uidriver_glfw.go index d58b2b579..396456a45 100644 --- a/uidriver_glfw.go +++ b/uidriver_glfw.go @@ -12,11 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build (darwin || freebsd || linux || windows) && !android && !ios && !js -// +build darwin freebsd linux windows -// +build !android -// +build !ios -// +build !js +//go:build !android && !js && !ios +// +build !android,!js,!ios package ebiten