From dfe4db67bea5e8190f0e125264b0d57f9ce66caf Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Thu, 16 Jun 2016 00:49:22 +0900 Subject: [PATCH] Fix for iOS --- audio/internal/driver/{driver_mobile.go => driver_ios.go} | 3 +-- audio/internal/driver/driver_openal.go | 5 ++++- genkeys.go | 3 ++- internal/graphics/opengl/context_desktop.go | 1 + internal/graphics/opengl/context_mobile.go | 2 +- internal/ui/input_glfw.go | 1 + internal/ui/input_mobile.go | 2 +- internal/ui/keys_glfw.go | 1 + internal/ui/ui_glfw.go | 1 + internal/ui/ui_mobile.go | 2 +- mobile/run.go | 2 +- 11 files changed, 15 insertions(+), 8 deletions(-) rename audio/internal/driver/{driver_mobile.go => driver_ios.go} (97%) diff --git a/audio/internal/driver/driver_mobile.go b/audio/internal/driver/driver_ios.go similarity index 97% rename from audio/internal/driver/driver_mobile.go rename to audio/internal/driver/driver_ios.go index f46c9b6f1..ad7444992 100644 --- a/audio/internal/driver/driver_mobile.go +++ b/audio/internal/driver/driver_ios.go @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This is not used anywhere so far. I plan to use this for iOS. -// +build ignore +// +build ios darwin,arm darwin,arm64 package driver diff --git a/audio/internal/driver/driver_openal.go b/audio/internal/driver/driver_openal.go index 0ebe60537..0896eeeda 100644 --- a/audio/internal/driver/driver_openal.go +++ b/audio/internal/driver/driver_openal.go @@ -12,7 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !js,!windows,!android +// +build darwin,!arm,!arm64 linux +// +build !js +// +build !android +// +build !ios package driver diff --git a/genkeys.go b/genkeys.go index 60d23d84b..fc361525b 100644 --- a/genkeys.go +++ b/genkeys.go @@ -266,7 +266,8 @@ func main() { case "internal/ui/keys_glfw.go": buildTag = `// +build darwin,!arm,!arm64 linux windows // +build !js -// +build !android` +// +build !android +// +build !ios` case "internal/ui/keys_js.go": buildTag = "// +build js" } diff --git a/internal/graphics/opengl/context_desktop.go b/internal/graphics/opengl/context_desktop.go index 8b7fceaab..5289c2e32 100644 --- a/internal/graphics/opengl/context_desktop.go +++ b/internal/graphics/opengl/context_desktop.go @@ -15,6 +15,7 @@ // +build darwin,!arm,!arm64 linux windows // +build !js // +build !android +// +build !ios package opengl diff --git a/internal/graphics/opengl/context_mobile.go b/internal/graphics/opengl/context_mobile.go index 45d2ee84d..8c1d68808 100644 --- a/internal/graphics/opengl/context_mobile.go +++ b/internal/graphics/opengl/context_mobile.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android darwin,arm darwin,arm64 +// +build android ios darwin,arm darwin,arm64 package opengl diff --git a/internal/ui/input_glfw.go b/internal/ui/input_glfw.go index 01cfae9a4..f441940c9 100644 --- a/internal/ui/input_glfw.go +++ b/internal/ui/input_glfw.go @@ -15,6 +15,7 @@ // +build darwin,!arm,!arm64 linux windows // +build !js // +build !android +// +build !ios package ui diff --git a/internal/ui/input_mobile.go b/internal/ui/input_mobile.go index 3fe3d785b..a14aabace 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 darwin,arm darwin,arm64 +// +build android ios darwin,arm darwin,arm64 package ui diff --git a/internal/ui/keys_glfw.go b/internal/ui/keys_glfw.go index 371a116da..182d11c8e 100644 --- a/internal/ui/keys_glfw.go +++ b/internal/ui/keys_glfw.go @@ -17,6 +17,7 @@ // +build darwin,!arm,!arm64 linux windows // +build !js // +build !android +// +build !ios package ui diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go index 7895ea6d9..d6dc8a9df 100644 --- a/internal/ui/ui_glfw.go +++ b/internal/ui/ui_glfw.go @@ -15,6 +15,7 @@ // +build darwin,!arm,!arm64 linux windows // +build !js // +build !android +// +build !ios package ui diff --git a/internal/ui/ui_mobile.go b/internal/ui/ui_mobile.go index dc8480691..4fb0c01e3 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 darwin,arm darwin,arm64 +// +build android ios darwin,arm darwin,arm64 package ui diff --git a/mobile/run.go b/mobile/run.go index c7a8c3e5b..ec4c2d750 100644 --- a/mobile/run.go +++ b/mobile/run.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android darwin,arm darwin,arm64 +// +build android ios darwin,arm darwin,arm64 package mobile