From 0ef1e61d55a2ab4398bc7fa567ccedaf4bccdcfc Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Thu, 26 Jan 2017 01:32:33 +0900 Subject: [PATCH] mobile: Fix iOS tag usages (#310) --- audio/internal/driver/driver_ios.go | 2 +- audio/internal/driver/driver_openal.go | 2 +- ebitenutil/loadimage.go | 2 +- genkeys.go | 2 +- internal/opengl/context_desktop.go | 2 +- internal/opengl/context_mobile.go | 2 +- internal/ui/input_glfw.go | 2 +- internal/ui/input_mobile.go | 2 +- internal/ui/keys_glfw.go | 2 +- internal/ui/ui_glfw.go | 2 +- internal/ui/ui_ios.go | 2 +- internal/ui/ui_mac.go | 2 +- internal/ui/ui_mobile.go | 2 +- mobile/impl_empty.go | 2 +- mobile/impl_mobile.go | 2 +- mobile/touches_empty.go | 2 +- mobile/touches_ios.go | 2 +- mobile/touches_mobile.go | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/audio/internal/driver/driver_ios.go b/audio/internal/driver/driver_ios.go index 302be9839..9c665a6b7 100644 --- a/audio/internal/driver/driver_ios.go +++ b/audio/internal/driver/driver_ios.go @@ -14,7 +14,7 @@ // TODO: Can we unify this into driver_openal.go? -// +build ios darwin,arm darwin,arm64 +// +build ios package driver diff --git a/audio/internal/driver/driver_openal.go b/audio/internal/driver/driver_openal.go index d155727f1..9569a3afe 100644 --- a/audio/internal/driver/driver_openal.go +++ b/audio/internal/driver/driver_openal.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 linux +// +build darwin linux // +build !js // +build !android // +build !ios diff --git a/ebitenutil/loadimage.go b/ebitenutil/loadimage.go index 22b41c715..95b75fc26 100644 --- a/ebitenutil/loadimage.go +++ b/ebitenutil/loadimage.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 linux windows +// +build darwin linux windows // +build !android // +build !ios diff --git a/genkeys.go b/genkeys.go index 854c15a00..9c9148b99 100644 --- a/genkeys.go +++ b/genkeys.go @@ -264,7 +264,7 @@ func main() { buildTag := "" switch path { case "internal/ui/keys_glfw.go": - buildTag = "// +build darwin,!arm,!arm64 linux windows" + + buildTag = "// +build darwin linux windows" + "\n// +build !js" + "\n// +build !android" + "\n// +build !ios" diff --git a/internal/opengl/context_desktop.go b/internal/opengl/context_desktop.go index 8f3e8dc6d..565f39756 100644 --- a/internal/opengl/context_desktop.go +++ b/internal/opengl/context_desktop.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 linux windows +// +build darwin linux windows // +build !js // +build !android // +build !ios diff --git a/internal/opengl/context_mobile.go b/internal/opengl/context_mobile.go index cd73d98c2..432adf371 100644 --- a/internal/opengl/context_mobile.go +++ b/internal/opengl/context_mobile.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android ios darwin,arm darwin,arm64 +// +build android ios package opengl diff --git a/internal/ui/input_glfw.go b/internal/ui/input_glfw.go index e09fcc5bf..c56b4eea5 100644 --- a/internal/ui/input_glfw.go +++ b/internal/ui/input_glfw.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 linux windows +// +build darwin linux windows // +build !js // +build !android // +build !ios diff --git a/internal/ui/input_mobile.go b/internal/ui/input_mobile.go index a14aabace..f5a98bfba 100644 --- a/internal/ui/input_mobile.go +++ b/internal/ui/input_mobile.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android ios darwin,arm darwin,arm64 +// +build android ios package ui diff --git a/internal/ui/keys_glfw.go b/internal/ui/keys_glfw.go index 8c8dd5376..c89aaf55c 100644 --- a/internal/ui/keys_glfw.go +++ b/internal/ui/keys_glfw.go @@ -14,7 +14,7 @@ // DO NOT EDIT: This file is auto-generated by genkeys.go. -// +build darwin,!arm,!arm64 linux windows +// +build darwin linux windows // +build !js // +build !android // +build !ios diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go index 4996c0717..81babc7d3 100644 --- a/internal/ui/ui_glfw.go +++ b/internal/ui/ui_glfw.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 linux windows +// +build darwin linux windows // +build !js // +build !android // +build !ios diff --git a/internal/ui/ui_ios.go b/internal/ui/ui_ios.go index ac34ecc9d..80bc37ef1 100644 --- a/internal/ui/ui_ios.go +++ b/internal/ui/ui_ios.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build ios darwin,arm darwin,arm64 +// +build ios package ui diff --git a/internal/ui/ui_mac.go b/internal/ui/ui_mac.go index 10b4862ae..d486720ca 100644 --- a/internal/ui/ui_mac.go +++ b/internal/ui/ui_mac.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 +// +build darwin // +build !js // +build !ios diff --git a/internal/ui/ui_mobile.go b/internal/ui/ui_mobile.go index a26158689..88a9929c0 100644 --- a/internal/ui/ui_mobile.go +++ b/internal/ui/ui_mobile.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android ios darwin,arm darwin,arm64 +// +build android ios package ui diff --git a/mobile/impl_empty.go b/mobile/impl_empty.go index e7cc27376..7ca65b755 100644 --- a/mobile/impl_empty.go +++ b/mobile/impl_empty.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 linux windows +// +build darwin linux windows // +build !android // +build !ios diff --git a/mobile/impl_mobile.go b/mobile/impl_mobile.go index 5aee11d7f..d80124ca9 100644 --- a/mobile/impl_mobile.go +++ b/mobile/impl_mobile.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android ios darwin,arm darwin,arm64 +// +build android ios package mobile diff --git a/mobile/touches_empty.go b/mobile/touches_empty.go index 4b023c2f2..34bc60691 100644 --- a/mobile/touches_empty.go +++ b/mobile/touches_empty.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin,!arm,!arm64 linux windows +// +build darwin linux windows // +build !android // +build !ios diff --git a/mobile/touches_ios.go b/mobile/touches_ios.go index 47c1b3d52..7472f261f 100644 --- a/mobile/touches_ios.go +++ b/mobile/touches_ios.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build ios darwin,arm darwin,arm64 +// +build ios package mobile diff --git a/mobile/touches_mobile.go b/mobile/touches_mobile.go index e93057790..c716d3ca5 100644 --- a/mobile/touches_mobile.go +++ b/mobile/touches_mobile.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android ios darwin,arm darwin,arm64 +// +build android ios package mobile