From 439d3e652c8f9bc19f39c498895e71f1bab9e520 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Mon, 28 Oct 2019 13:30:51 +0100
Subject: [PATCH] app/internal: consolidate CFLAGS and move -Werror to #cgo
 directives

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 app/internal/gl/functions.go      | 1 +
 app/internal/log/log_ios.go       | 2 +-
 app/internal/window/gl_ios.go     | 2 --
 app/internal/window/gl_macos.go   | 2 --
 app/internal/window/os_android.go | 2 +-
 app/internal/window/os_macos.go   | 1 +
 cmd/gogio/androidbuild.go         | 1 -
 cmd/gogio/iosbuild.go             | 1 -
 8 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/internal/gl/functions.go b/app/internal/gl/functions.go
index b572e25f..a7f07047 100644
--- a/app/internal/gl/functions.go
+++ b/app/internal/gl/functions.go
@@ -9,6 +9,7 @@ import (
 )
 
 /*
+#cgo CFLAGS: -Werror
 #cgo linux LDFLAGS: -lGLESv2 -ldl
 #cgo darwin,!ios CFLAGS: -DGL_SILENCE_DEPRECATION
 #cgo darwin,!ios LDFLAGS: -framework OpenGL
diff --git a/app/internal/log/log_ios.go b/app/internal/log/log_ios.go
index 6f1a05e9..11472e80 100644
--- a/app/internal/log/log_ios.go
+++ b/app/internal/log/log_ios.go
@@ -5,7 +5,7 @@
 package log
 
 /*
-#cgo CFLAGS: -fmodules -fobjc-arc -x objective-c
+#cgo CFLAGS: -Werror -fmodules -fobjc-arc -x objective-c
 
 #include "log_ios.h"
 */
diff --git a/app/internal/window/gl_ios.go b/app/internal/window/gl_ios.go
index 2ad13a3c..c84de1d2 100644
--- a/app/internal/window/gl_ios.go
+++ b/app/internal/window/gl_ios.go
@@ -5,8 +5,6 @@
 package window
 
 /*
-#cgo CFLAGS: -fmodules -fobjc-arc -x objective-c
-
 #include <CoreFoundation/CoreFoundation.h>
 #include <OpenGLES/ES2/gl.h>
 #include <OpenGLES/ES2/glext.h>
diff --git a/app/internal/window/gl_macos.go b/app/internal/window/gl_macos.go
index 98eee70b..58194730 100644
--- a/app/internal/window/gl_macos.go
+++ b/app/internal/window/gl_macos.go
@@ -9,8 +9,6 @@ import (
 )
 
 /*
-#cgo CFLAGS: -DGL_SILENCE_DEPRECATION -fmodules -fobjc-arc -x objective-c
-
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreGraphics/CoreGraphics.h>
 #include <AppKit/AppKit.h>
diff --git a/app/internal/window/os_android.go b/app/internal/window/os_android.go
index 74632ce9..4b8a1562 100644
--- a/app/internal/window/os_android.go
+++ b/app/internal/window/os_android.go
@@ -3,7 +3,7 @@
 package window
 
 /*
-#cgo LDFLAGS: -landroid
+#cgo LDFLAGS: -Werror -landroid
 
 #include <android/native_window_jni.h>
 #include <android/configuration.h>
diff --git a/app/internal/window/os_macos.go b/app/internal/window/os_macos.go
index 17c279dd..71c39ca7 100644
--- a/app/internal/window/os_macos.go
+++ b/app/internal/window/os_macos.go
@@ -21,6 +21,7 @@ import (
 /*
 #cgo CFLAGS: -DGL_SILENCE_DEPRECATION -Werror -Wno-deprecated-declarations -fmodules -fobjc-arc -x objective-c
 
+
 #include <AppKit/AppKit.h>
 #include "os_macos.h"
 */
diff --git a/cmd/gogio/androidbuild.go b/cmd/gogio/androidbuild.go
index 054b8e2c..a42427ca 100644
--- a/cmd/gogio/androidbuild.go
+++ b/cmd/gogio/androidbuild.go
@@ -126,7 +126,6 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
 			"GOARCH="+a,
 			"CGO_ENABLED=1",
 			"CC="+clang,
-			"CGO_CFLAGS=-Werror",
 		)
 		builds.Go(func() error {
 			_, err := runCmd(cmd)
diff --git a/cmd/gogio/iosbuild.go b/cmd/gogio/iosbuild.go
index 3e2cde15..0571129a 100644
--- a/cmd/gogio/iosbuild.go
+++ b/cmd/gogio/iosbuild.go
@@ -483,7 +483,6 @@ func iosCompilerFor(target, arch string) (string, []string, error) {
 	}
 	cflags := []string{
 		"-fembed-bitcode",
-		"-Werror",
 		"-arch", allArchs[arch].iosArch,
 		"-isysroot", sdkPath,
 		"-m" + platformOS + "-version-min=" + minIOSVersion,