From 77899c79d9e5a154c0856f6b403052c2ae0f9675 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 17 May 2020 14:54:41 +0200 Subject: [PATCH] app/internal/window: [iOS] fold header files into Go preambles Signed-off-by: Elias Naur --- app/internal/window/gl_ios.go | 7 ++++++- app/internal/window/gl_ios.h | 7 ------- app/internal/window/gl_ios.m | 2 +- app/internal/window/os_ios.go | 7 ++++++- app/internal/window/os_ios.h | 8 -------- app/internal/window/os_ios.m | 1 - 6 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 app/internal/window/gl_ios.h delete mode 100644 app/internal/window/os_ios.h diff --git a/app/internal/window/gl_ios.go b/app/internal/window/gl_ios.go index 2dbd9710..00991895 100644 --- a/app/internal/window/gl_ios.go +++ b/app/internal/window/gl_ios.go @@ -8,7 +8,12 @@ package window #include #include #include -#include "gl_ios.h" + +__attribute__ ((visibility ("hidden"))) int gio_renderbufferStorage(CFTypeRef ctx, CFTypeRef layer, GLenum buffer); +__attribute__ ((visibility ("hidden"))) int gio_presentRenderbuffer(CFTypeRef ctx, GLenum buffer); +__attribute__ ((visibility ("hidden"))) int gio_makeCurrent(CFTypeRef ctx); +__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createContext(void); +__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createGLLayer(void); */ import "C" diff --git a/app/internal/window/gl_ios.h b/app/internal/window/gl_ios.h deleted file mode 100644 index 113dd181..00000000 --- a/app/internal/window/gl_ios.h +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -__attribute__ ((visibility ("hidden"))) int gio_renderbufferStorage(CFTypeRef ctx, CFTypeRef layer, GLenum buffer); -__attribute__ ((visibility ("hidden"))) int gio_presentRenderbuffer(CFTypeRef ctx, GLenum buffer); -__attribute__ ((visibility ("hidden"))) int gio_makeCurrent(CFTypeRef ctx); -__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createContext(void); -__attribute__ ((visibility ("hidden"))) CFTypeRef gio_createGLLayer(void); diff --git a/app/internal/window/gl_ios.m b/app/internal/window/gl_ios.m index 2e7fcd9e..065ea974 100644 --- a/app/internal/window/gl_ios.m +++ b/app/internal/window/gl_ios.m @@ -5,7 +5,7 @@ @import UIKit; @import OpenGLES; -#include "gl_ios.h" +#include "_cgo_export.h" int gio_renderbufferStorage(CFTypeRef ctxRef, CFTypeRef layerRef, GLenum buffer) { EAGLContext *ctx = (__bridge EAGLContext *)ctxRef; diff --git a/app/internal/window/os_ios.go b/app/internal/window/os_ios.go index 2a4f5650..bab5187e 100644 --- a/app/internal/window/os_ios.go +++ b/app/internal/window/os_ios.go @@ -10,8 +10,13 @@ package window #include #include #include -#include "os_ios.h" +__attribute__ ((visibility ("hidden"))) void gio_showTextInput(CFTypeRef viewRef); +__attribute__ ((visibility ("hidden"))) void gio_hideTextInput(CFTypeRef viewRef); +__attribute__ ((visibility ("hidden"))) void gio_addLayerToView(CFTypeRef viewRef, CFTypeRef layerRef); +__attribute__ ((visibility ("hidden"))) void gio_updateView(CFTypeRef viewRef, CFTypeRef layerRef); +__attribute__ ((visibility ("hidden"))) void gio_removeLayer(CFTypeRef layerRef); +__attribute__ ((visibility ("hidden"))) void gio_setAnimating(CFTypeRef viewRef, int anim); */ import "C" diff --git a/app/internal/window/os_ios.h b/app/internal/window/os_ios.h deleted file mode 100644 index 0bddb439..00000000 --- a/app/internal/window/os_ios.h +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -__attribute__ ((visibility ("hidden"))) void gio_showTextInput(CFTypeRef viewRef); -__attribute__ ((visibility ("hidden"))) void gio_hideTextInput(CFTypeRef viewRef); -__attribute__ ((visibility ("hidden"))) void gio_addLayerToView(CFTypeRef viewRef, CFTypeRef layerRef); -__attribute__ ((visibility ("hidden"))) void gio_updateView(CFTypeRef viewRef, CFTypeRef layerRef); -__attribute__ ((visibility ("hidden"))) void gio_removeLayer(CFTypeRef layerRef); -__attribute__ ((visibility ("hidden"))) void gio_setAnimating(CFTypeRef viewRef, int anim); diff --git a/app/internal/window/os_ios.m b/app/internal/window/os_ios.m index 4e28134f..81b39652 100644 --- a/app/internal/window/os_ios.m +++ b/app/internal/window/os_ios.m @@ -6,7 +6,6 @@ #include #include "_cgo_export.h" -#include "os_ios.h" #include "framework_ios.h" @interface GioView: UIView