CMake: fix building media and gl lib for iOS

build/cmake/files.cmake

@@ -3041,11 +3041,16 @@ set(OPENGL_GTK_HDR
     wx/unix/glx11.h
 )
 
-set(OPENGL_OSX_SHARED_SRC
+set(OPENGL_OSX_COCOA_SRC
     src/osx/cocoa/glcanvas.mm
     src/osx/glcanvas_osx.cpp
 )
 
+set(OPENGL_OSX_IPHONE_SRC
+    src/osx/iphone/glcanvas.mm
+    src/osx/glcanvas_osx.cpp
+)
+
 set(UNIX_SOUND_SDL_SRC
     src/unix/sound_sdl.cpp
 )

build/cmake/init.cmake

@@ -385,7 +385,12 @@ if(wxUSE_GUI)
 
     # extra dependencies
     if(wxUSE_OPENGL)
-        find_package(OpenGL)
+        if(WXOSX_IPHONE)
+            set(OPENGL_FOUND TRUE)
+            set(OPENGL_LIBRARIES "-framework OpenGLES" "-framework QuartzCore")
+        else()
+            find_package(OpenGL)
+        endif()
         if(NOT OPENGL_FOUND)
             message(WARNING "opengl not found, wxGLCanvas won't be available")
             wx_option_force_value(wxUSE_OPENGL OFF)

build/cmake/lib/gl/CMakeLists.txt

@@ -15,8 +15,10 @@ if(WXMSW)
     wx_append_sources(GL_FILES OPENGL_MSW)
 elseif(WXGTK)
     wx_append_sources(GL_FILES OPENGL_GTK)
-elseif(APPLE)
-    wx_append_sources(GL_FILES OPENGL_OSX_SHARED)
+elseif(WXOSX_COCOA)
+    wx_append_sources(GL_FILES OPENGL_OSX_COCOA)
+elseif(WXOSX_IPHONE)
+    wx_append_sources(GL_FILES OPENGL_OSX_IPHONE)
 elseif(WXQT)
     wx_append_sources(GL_FILES OPENGL_QT)
 endif()

build/cmake/lib/media/CMakeLists.txt

@@ -15,6 +15,8 @@ if(WXMSW)
     wx_append_sources(MEDIA_FILES MEDIA_MSW)
 elseif(WXOSX_COCOA)
     wx_append_sources(MEDIA_FILES MEDIA_OSX_COCOA)
+elseif(WXOSX_IPHONE)
+    wx_append_sources(MEDIA_FILES MEDIA_OSX_IPHONE)
 elseif(UNIX)
     wx_append_sources(MEDIA_FILES MEDIA_UNIX)
 elseif(WXQT)
@@ -22,13 +24,11 @@ elseif(WXQT)
 endif()
 
 wx_add_library(wxmedia ${MEDIA_FILES})
-if(WXOSX_COCOA)
-    # TODO: add version detection of some kind and/or wx_option
-    wx_lib_compile_definitions(wxmedia PRIVATE -DwxOSX_USE_QTKIT=0)
+if(WXOSX)
     wx_lib_link_libraries(wxmedia PUBLIC
         "-framework AVFoundation"
-        "-framework AVKit"
         "-framework CoreMedia"
+        "-weak_framework AVKit"
         )
 elseif(UNIX)
     wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INCLUDE_DIRS})

build/files

@@ -2980,10 +2980,14 @@ OPENGL_GTK_SRC =
 OPENGL_MSW_HDR =
     wx/msw/glcanvas.h
 
-OPENGL_OSX_SHARED_SRC =
+OPENGL_OSX_COCOA_SRC =
     src/osx/cocoa/glcanvas.mm
     src/osx/glcanvas_osx.cpp
 
+OPENGL_OSX_IPHONE_SRC =
+    src/osx/iphone/glcanvas.mm
+    src/osx/glcanvas_osx.cpp
+
 # Misc plugin sources:
 
 UNIX_SOUND_SDL_SRC =