From d1efcc374b359317458675a1c3cbab7ff807b107 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 15 Mar 2021 14:09:07 +0100 Subject: [PATCH] Adding GLKit to console and cmake builds --- build/cmake/init.cmake | 2 +- configure | 2 +- configure.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 6dca1cc869..0bc4f934b9 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -409,7 +409,7 @@ if(wxUSE_GUI) if(wxUSE_OPENGL) if(WXOSX_IPHONE) set(OPENGL_FOUND TRUE) - set(OPENGL_LIBRARIES "-framework OpenGLES" "-framework QuartzCore") + set(OPENGL_LIBRARIES "-framework OpenGLES" "-framework QuartzCore" "-framework GLKit") else() find_package(OpenGL) if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL) diff --git a/configure b/configure index cc6f1b187c..c367798fa9 100755 --- a/configure +++ b/configure @@ -38307,7 +38307,7 @@ EXTRA_FRAMEWORKS= if test "$wxUSE_MAC" = 1 ; then if test "$USE_DARWIN" = 1; then if test "$wxUSE_OSX_IPHONE" = 1; then - EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore -framework CoreText" + EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore -framework GLKit -framework CoreText" else EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" diff --git a/configure.in b/configure.in index ed211cee13..8fab1fdd69 100644 --- a/configure.in +++ b/configure.in @@ -8028,7 +8028,7 @@ EXTRA_FRAMEWORKS= if test "$wxUSE_MAC" = 1 ; then if test "$USE_DARWIN" = 1; then if test "$wxUSE_OSX_IPHONE" = 1; then - EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore -framework CoreText" + EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore -framework GLKit -framework CoreText" else EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"