-
Notifications
You must be signed in to change notification settings - Fork 206
Expand file tree
/
Copy pathqt_fix.patch
More file actions
44 lines (38 loc) · 1.6 KB
/
qt_fix.patch
File metadata and controls
44 lines (38 loc) · 1.6 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
diff --git a/lib/cmake/Qt6/FindWrapOpenGL.cmake b/lib/cmake/Qt6/FindWrapOpenGL.cmake
index 3f95561..e794e78 100644
--- a/lib/cmake/Qt6/FindWrapOpenGL.cmake
+++ b/lib/cmake/Qt6/FindWrapOpenGL.cmake
@@ -35,16 +35,7 @@ if (OpenGL_FOUND)
set(__opengl_fw_path "-framework OpenGL")
endif()
- find_library(WrapOpenGL_AGL NAMES AGL)
- if(WrapOpenGL_AGL)
- set(__opengl_agl_fw_path "${WrapOpenGL_AGL}")
- endif()
- if(NOT __opengl_agl_fw_path)
- set(__opengl_agl_fw_path "-framework AGL")
- endif()
-
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path})
- target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_agl_fw_path})
else()
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL)
endif()
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 303cf65..6650949 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -14,8 +14,7 @@ QMAKE_LIBDIR =
# sdk.prf will prefix the proper SDK sysroot
QMAKE_INCDIR_OPENGL = \
- /System/Library/Frameworks/OpenGL.framework/Headers \
- /System/Library/Frameworks/AGL.framework/Headers/
+ /System/Library/Frameworks/OpenGL.framework/Headers
QMAKE_FIX_RPATH = install_name_tool -id
@@ -25,7 +24,7 @@ QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
QMAKE_REL_RPATH_BASE = @loader_path
QMAKE_LIBS_DYNLOAD =
-QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
+QMAKE_LIBS_OPENGL = -framework OpenGL
QMAKE_LIBS_THREAD =
QMAKE_INCDIR_WAYLAND =