Merge pull request #4227 from ligfx/clean_objc

Don't force compile everything as Objective-C++ on macOS
2025-09-21 16:58:45 +00:00 · 2016-10-02 19:42:04 -07:00 · 2016-10-02 19:42:04 -07:00 · 8fcc3b04e0
commit 8fcc3b04e0
parent ccfc081697 cd19c9fa22
13 changed files with 89 additions and 133 deletions
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@ -82,7 +82,7 @@ endif()
 if(WIN32)
    set(SRCS ${SRCS} GL/GLInterface/WGL.cpp)
 elseif(APPLE)
-    set(SRCS ${SRCS} GL/GLInterface/AGL.cpp)
+    set(SRCS ${SRCS} GL/GLInterface/AGL.mm)
 elseif(USE_X11)
    if (NOT USE_EGL)
        set(SRCS ${SRCS} GL/GLInterface/GLX.cpp)
--- a/Source/Core/Common/GL/GLInterface/AGL.h
+++ b/Source/Core/Common/GL/GLInterface/AGL.h
@ -4,8 +4,11 @@

 #pragma once

-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__OBJC__)
 #import <AppKit/AppKit.h>
+#else
+struct NSOpenGLContext;
+struct NSView;
 #endif

 #include "Common/GL/GLInterfaceBase.h"
--- a/Source/Core/Common/GL/GLInterface/AGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/AGL.cpp