Clean up build tags

This commit is contained in:
Hajime Hoshi 2021-10-24 14:49:21 +09:00
parent 878831b842
commit ef62f407d1
13 changed files with 26 additions and 53 deletions

View File

@ -12,11 +12,8 @@
// 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.
//go:build (darwin || freebsd || linux || windows) && !js && !android && !ios //go:build !android && !js && !ios
// +build darwin freebsd linux windows // +build !android,!js,!ios
// +build !js
// +build !android
// +build !ios
package ebitenutil package ebitenutil

View File

@ -12,10 +12,8 @@
// 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.
//go:build (darwin || freebsd || js || linux || windows) && !android && !ios //go:build !android && !ios
// +build darwin freebsd js linux windows // +build !android,!ios
// +build !android
// +build !ios
package ebitenutil package ebitenutil

View File

@ -818,10 +818,8 @@ func main() {
buildTag = "//go:build !js" + buildTag = "//go:build !js" +
"\n// +build !js" "\n// +build !js"
case filepath.Join("internal", "uidriver", "glfw", "keys.go"): case filepath.Join("internal", "uidriver", "glfw", "keys.go"):
buildTag = "//go:build (darwin || freebsd || linux || windows) && !android && !ios" + buildTag = "//go:build !android && !js && !ios" +
"\n// +build darwin freebsd linux windows" + "\n// +build !android,!js,!ios"
"\n// +build !android" +
"\n// +build !ios"
} }
// NOTE: According to godoc, maps are automatically sorted by key. // NOTE: According to godoc, maps are automatically sorted by key.
if err := tmpl.Execute(f, struct { if err := tmpl.Execute(f, struct {

View File

@ -12,10 +12,8 @@
// 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.
//go:build (darwin || freebsd || linux || windows) && !android && !ios //go:build !android && !js && !ios
// +build darwin freebsd linux windows // +build !android,!js,!ios
// +build !android
// +build !ios
package opengl package opengl

View File

@ -12,8 +12,8 @@
// 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.
//go:build freebsd || linux || windows || ebitengl //go:build !android && !js && !ios
// +build freebsd linux windows ebitengl // +build !android,!js,!ios
package glfw package glfw

View File

@ -12,10 +12,8 @@
// 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.
//go:build (darwin || freebsd || linux || windows) && !android && !ios //go:build !android && !js && !ios
// +build darwin freebsd linux windows // +build !android,!js,!ios
// +build !android
// +build !ios
//go:generate curl --location --remote-name https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt //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 //go:generate file2byteslice -package glfw -input=./gamecontrollerdb.txt -output=./gamecontrollerdb.txt.go -var=gamecontrollerdbTxt

View File

@ -14,10 +14,8 @@
// Code generated by genkeys.go using 'go generate'. DO NOT EDIT. // Code generated by genkeys.go using 'go generate'. DO NOT EDIT.
//go:build (darwin || freebsd || linux || windows) && !android && !ios //go:build !android && !js && !ios
// +build darwin freebsd linux windows // +build !android,!js,!ios
// +build !android
// +build !ios
package glfw package glfw

View File

@ -12,11 +12,8 @@
// 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.
//go:build !ebitensinglethread && (darwin || freebsd || linux || windows) && !android && !ios //go:build !ebitensinglethread && !android && !js && !ios
// +build !ebitensinglethread // +build !ebitensinglethread,!android,!js,!ios
// +build darwin freebsd linux windows
// +build !android
// +build !ios
package glfw package glfw

View File

@ -12,11 +12,8 @@
// 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.
//go:build ebitensinglethread && (darwin || freebsd || linux || windows) && !android && !ios //go:build ebitensinglethread && !android && !js && !ios
// +build ebitensinglethread // +build ebitensinglethread,!android,!js,!ios
// +build darwin freebsd linux windows
// +build !android
// +build !ios
package glfw package glfw

View File

@ -12,10 +12,8 @@
// 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.
//go:build (darwin || freebsd || linux || windows) && !android && !ios //go:build !android && !js && !ios
// +build darwin freebsd linux windows // +build !android,!js,!ios
// +build !android
// +build !ios
package glfw package glfw

View File

@ -12,9 +12,8 @@
// 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.
//go:build (dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !android //go:build !android && !darwin && !js && !ios && !windows
// +build dragonfly freebsd linux netbsd openbsd solaris // +build !android,!darwin,!js,!ios,!windows
// +build !android
package glfw package glfw

View File

@ -12,10 +12,8 @@
// 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.
//go:build (darwin || freebsd || linux || windows) && !android && !ios //go:build !android && !js && !ios
// +build darwin freebsd linux windows // +build !android,!js,!ios
// +build !android
// +build !ios
package glfw package glfw

View File

@ -12,11 +12,8 @@
// 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.
//go:build (darwin || freebsd || linux || windows) && !android && !ios && !js //go:build !android && !js && !ios
// +build darwin freebsd linux windows // +build !android,!js,!ios
// +build !android
// +build !ios
// +build !js
package ebiten package ebiten