Fix build tags for iOS (WIP)

This commit is contained in:
Hajime Hoshi 2016-06-14 22:43:37 +09:00
parent d72a71877a
commit 13f594baed
9 changed files with 14 additions and 9 deletions

View File

@ -53,7 +53,7 @@ func images_arcadefont_png() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "images/arcadefont.png", size: 1008, mode: os.FileMode(420), modTime: time.Unix(1460059047, 0)} info := bindata_file_info{name: "images/arcadefont.png", size: 1008, mode: os.FileMode(420), modTime: time.Unix(1463226773, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -70,7 +70,7 @@ func images_ebiten_png() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "images/ebiten.png", size: 3383, mode: os.FileMode(420), modTime: time.Unix(1460059047, 0)} info := bindata_file_info{name: "images/ebiten.png", size: 3383, mode: os.FileMode(420), modTime: time.Unix(1463226773, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -87,7 +87,7 @@ func images_fiveyears_jpg() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "images/fiveyears.jpg", size: 31543, mode: os.FileMode(420), modTime: time.Unix(1460086497, 0)} info := bindata_file_info{name: "images/fiveyears.jpg", size: 31543, mode: os.FileMode(420), modTime: time.Unix(1463226773, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }
@ -104,7 +104,7 @@ func images_gophers_jpg() (*asset, error) {
return nil, err return nil, err
} }
info := bindata_file_info{name: "images/gophers.jpg", size: 16645, mode: os.FileMode(420), modTime: time.Unix(1460059047, 0)} info := bindata_file_info{name: "images/gophers.jpg", size: 16645, mode: os.FileMode(420), modTime: time.Unix(1463226773, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }

View File

@ -1,4 +1,4 @@
// Copyright 2014 Hajime Hoshi // Copyright 2013 Hajime Hoshi
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.

View File

@ -264,7 +264,9 @@ func main() {
buildTag := "" buildTag := ""
switch path { switch path {
case "internal/ui/keys_glfw.go": case "internal/ui/keys_glfw.go":
buildTag = "// +build !js\n// +build !android" buildTag = `// +build darwin,!arm,!arm64 linux windows
// +build !js
// +build !android`
case "internal/ui/keys_js.go": case "internal/ui/keys_js.go":
buildTag = "// +build js" buildTag = "// +build js"
} }

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build darwin linux windows // +build darwin,!arm darwin,!arm64 linux windows
// +build !js // +build !js
// +build !android // +build !android

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build android // +build android darwin,arm darwin,arm64
package opengl package opengl

View File

@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build darwin,!arm,!arm64 linux windows
// +build !js // +build !js
// +build !android // +build !android

View File

@ -16,6 +16,7 @@
// +build !js // +build !js
// +build !android // +build !android
// +build darwin,!arm darwin,!arm64
package ui package ui

View File

@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build darwin,!arm,!arm64 linux windows
// +build !js // +build !js
// +build !android // +build !android

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build android // +build android darwin,arm darwin,arm64
package mobile package mobile