diff --git a/ebitenutil/file_notjs.go b/ebitenutil/file_notjs.go index 7f2dfa843..104998630 100644 --- a/ebitenutil/file_notjs.go +++ b/ebitenutil/file_notjs.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !js && !ios -// +build !android,!js,!ios +//go:build !android && !ios && !js +// +build !android,!ios,!js package ebitenutil diff --git a/genkeys.go b/genkeys.go index ffd75c7db..4550cc95e 100644 --- a/genkeys.go +++ b/genkeys.go @@ -817,8 +817,8 @@ func main() { "\n// +build android ios" + "\n// +build !ebitencbackend" case filepath.Join("internal", "ui", "keys_glfw.go"): - buildTag = "//go:build !android && !js && !ios && !ebitencbackend" + - "\n// +build !android,!js,!ios,!ebitencbackend" + buildTag = "//go:build !android && !ios && !js && !ebitencbackend" + + "\n// +build !android,!ios,!js,!ebitencbackend" } // NOTE: According to godoc, maps are automatically sorted by key. if err := tmpl.Execute(f, struct { diff --git a/imagedumper_desktop.go b/imagedumper_desktop.go index 15141edb3..45fdc2417 100644 --- a/imagedumper_desktop.go +++ b/imagedumper_desktop.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !js && !ios -// +build !android,!js,!ios +//go:build !android && !ios && !js +// +build !android,!ios,!js package ebiten diff --git a/imagedumper_notdesktop.go b/imagedumper_notdesktop.go index f5bb0ce64..c598ffde1 100644 --- a/imagedumper_notdesktop.go +++ b/imagedumper_notdesktop.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build android || js || ios -// +build android js ios +//go:build android || ios || js +// +build android ios js package ebiten diff --git a/internal/graphicsdriver/opengl/context_desktop.go b/internal/graphicsdriver/opengl/context_desktop.go index cb1c71f4a..974f02b83 100644 --- a/internal/graphicsdriver/opengl/context_desktop.go +++ b/internal/graphicsdriver/opengl/context_desktop.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !js && !ios -// +build !android,!js,!ios +//go:build !android && !ios && !js +// +build !android,!ios,!js package opengl diff --git a/internal/graphicsdriver/opengl/shader_desktop.go b/internal/graphicsdriver/opengl/shader_desktop.go index 61e346d4e..540ca5cbf 100644 --- a/internal/graphicsdriver/opengl/shader_desktop.go +++ b/internal/graphicsdriver/opengl/shader_desktop.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !js && !ios -// +build !android,!js,!ios +//go:build !android && !ios && !js +// +build !android,!ios,!js package opengl diff --git a/internal/processtest/processtest_test.go b/internal/processtest/processtest_test.go index 70005a087..5a459416b 100644 --- a/internal/processtest/processtest_test.go +++ b/internal/processtest/processtest_test.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !js && !ios -// +build !android,!js,!ios +//go:build !android && !ios && !js +// +build !android,!ios,!js package processtest_test diff --git a/internal/ui/input_glfw.go b/internal/ui/input_glfw.go index 6bffe6178..12822d6bc 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 && !js && !ios && !ebitencbackend -// +build !android,!js,!ios,!ebitencbackend +//go:build !android && !ios && !js && !ebitencbackend +// +build !android,!ios,!js,!ebitencbackend package ui diff --git a/internal/ui/keys_glfw.go b/internal/ui/keys_glfw.go index 39522a2d1..f28b578f9 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 && !js && !ios && !ebitencbackend -// +build !android,!js,!ios,!ebitencbackend +//go:build !android && !ios && !js && !ebitencbackend +// +build !android,!ios,!js,!ebitencbackend package ui diff --git a/internal/ui/run_notsinglethread.go b/internal/ui/run_notsinglethread.go index 0264958ca..3dd0aa2d2 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 && !js && !ios && !ebitencbackend && !ebitensinglethread -// +build !android,!js,!ios,!ebitencbackend,!ebitensinglethread +//go:build !android && !ios && !js && !ebitencbackend && !ebitensinglethread +// +build !android,!ios,!js,!ebitencbackend,!ebitensinglethread package ui diff --git a/internal/ui/run_singlethread.go b/internal/ui/run_singlethread.go index 6e788f14f..649048e8f 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 && !js && !ios && !ebitencbackend && ebitensinglethread -// +build !android,!js,!ios,!ebitencbackend,ebitensinglethread +//go:build !android && !ios && !js && !ebitencbackend && ebitensinglethread +// +build !android,!ios,!js,!ebitencbackend,ebitensinglethread package ui diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go index bbc1f2c0d..1b03868cb 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 && !js && !ios && !ebitencbackend -// +build !android,!js,!ios,!ebitencbackend +//go:build !android && !ios && !js && !ebitencbackend +// +build !android,!ios,!js,!ebitencbackend package ui diff --git a/internal/ui/window_glfw.go b/internal/ui/window_glfw.go index a84676356..b22620e0d 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 && !js && !ios && !ebitencbackend -// +build !android,!js,!ios,!ebitencbackend +//go:build !android && !ios && !js && !ebitencbackend +// +build !android,!ios,!js,!ebitencbackend package ui diff --git a/internal/ui/window_null.go b/internal/ui/window_null.go index 059eda1d4..861f67c56 100644 --- a/internal/ui/window_null.go +++ b/internal/ui/window_null.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build android || js || ios || ebitencbackend -// +build android js ios ebitencbackend +//go:build android || ios || js || ebitencbackend +// +build android ios js ebitencbackend package ui