From cfc1991dedf61f463d22f58207a96a59b976ad31 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 17 May 2020 14:47:47 +0200 Subject: [PATCH] app/headless: fold header files into Go preambles Signed-off-by: Elias Naur --- app/headless/headless_darwin.go | 7 ++++++- app/headless/headless_darwin.h | 7 ------- app/headless/headless_ios.m | 2 +- app/headless/headless_macos.m | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 app/headless/headless_darwin.h diff --git a/app/headless/headless_darwin.go b/app/headless/headless_darwin.go index 8b9b0e37..16145e3c 100644 --- a/app/headless/headless_darwin.go +++ b/app/headless/headless_darwin.go @@ -14,7 +14,12 @@ import ( #cgo CFLAGS: -DGL_SILENCE_DEPRECATION -Werror -Wno-deprecated-declarations -fmodules -fobjc-arc -x objective-c #include -#include "headless_darwin.h" + +__attribute__ ((visibility ("hidden"))) CFTypeRef gio_headless_newContext(void); +__attribute__ ((visibility ("hidden"))) void gio_headless_releaseContext(CFTypeRef ctxRef); +__attribute__ ((visibility ("hidden"))) void gio_headless_clearCurrentContext(CFTypeRef ctxRef); +__attribute__ ((visibility ("hidden"))) void gio_headless_makeCurrentContext(CFTypeRef ctxRef); +__attribute__ ((visibility ("hidden"))) void gio_headless_prepareContext(CFTypeRef ctxRef); */ import "C" diff --git a/app/headless/headless_darwin.h b/app/headless/headless_darwin.h deleted file mode 100644 index 227468d5..00000000 --- a/app/headless/headless_darwin.h +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -__attribute__ ((visibility ("hidden"))) CFTypeRef gio_headless_newContext(void); -__attribute__ ((visibility ("hidden"))) void gio_headless_releaseContext(CFTypeRef ctxRef); -__attribute__ ((visibility ("hidden"))) void gio_headless_clearCurrentContext(CFTypeRef ctxRef); -__attribute__ ((visibility ("hidden"))) void gio_headless_makeCurrentContext(CFTypeRef ctxRef); -__attribute__ ((visibility ("hidden"))) void gio_headless_prepareContext(CFTypeRef ctxRef); diff --git a/app/headless/headless_ios.m b/app/headless/headless_ios.m index 3942b0ef..fd72d254 100644 --- a/app/headless/headless_ios.m +++ b/app/headless/headless_ios.m @@ -5,7 +5,7 @@ @import OpenGLES; #include -#include "headless_darwin.h" +#include "_cgo_export.h" void gio_headless_releaseContext(CFTypeRef ctxRef) { CFBridgingRelease(ctxRef); diff --git a/app/headless/headless_macos.m b/app/headless/headless_macos.m index 6ca5eb17..46deb375 100644 --- a/app/headless/headless_macos.m +++ b/app/headless/headless_macos.m @@ -8,7 +8,7 @@ @import OpenGL.GL3; #include -#include "headless_darwin.h" +#include "_cgo_export.h" void gio_headless_releaseContext(CFTypeRef ctxRef) { CFBridgingRelease(ctxRef);