Skip to content

Commit 77aa5d4

Browse files
author
schm1dtmac
authored
[macOS] Don’t compile in GL-related code or link GLEW
This seems sensible enough since macOS’s archaic, deprecated OpenGL implementation isn’t supported by RPCS3 anyways. Also fixes some CI fails caused by GLEW as a consequence.
1 parent 847a147 commit 77aa5d4

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

.ci/build-mac-arm64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
66
export HOMEBREW_NO_ENV_HINTS=1
77
export HOMEBREW_NO_INSTALL_CLEANUP=1
88

9-
brew install -f --overwrite --quiet googletest opencv@4 ffmpeg@5 "llvm@$LLVM_COMPILER_VER" glew sdl3 vulkan-headers vulkan-loader
9+
brew install -f --overwrite --quiet googletest opencv@4 ffmpeg@5 "llvm@$LLVM_COMPILER_VER" sdl3 vulkan-headers vulkan-loader
1010
brew unlink --quiet ffmpeg qtbase qtsvg qtdeclarative
1111

1212
brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5

.ci/build-mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ brew install -f --overwrite --quiet ccache "llvm@$LLVM_COMPILER_VER"
1010
brew link -f --overwrite --quiet "llvm@$LLVM_COMPILER_VER"
1111
# shellcheck disable=SC3009
1212
arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
13-
arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet python@3.14 opencv@4 ffmpeg@5 "llvm@$LLVM_COMPILER_VER" glew sdl3 vulkan-headers vulkan-loader
13+
arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet python@3.14 opencv@4 ffmpeg@5 "llvm@$LLVM_COMPILER_VER" sdl3 vulkan-headers vulkan-loader
1414
arch -x86_64 /usr/local/bin/brew unlink --quiet ffmpeg qtbase qtsvg qtdeclarative
1515
arch -x86_64 /usr/local/bin/brew link -f --overwrite --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
1616

3rdparty/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ add_subdirectory(yaml-cpp)
107107

108108
# OpenGL
109109

110-
if (NOT ANDROID)
110+
if (NOT ANDROID AND NOT APPLE)
111111
find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
112112

113113
add_library(3rdparty_opengl INTERFACE)
@@ -119,8 +119,6 @@ if (NOT ANDROID)
119119
else()
120120
target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib)
121121
endif()
122-
elseif(APPLE)
123-
target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
124122
else()
125123
target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
126124
endif()
@@ -335,7 +333,7 @@ endif()
335333

336334
# GLEW
337335
add_library(3rdparty_glew INTERFACE)
338-
if(NOT MSVC AND NOT ANDROID)
336+
if(NOT MSVC AND NOT ANDROID AND NOT APPLE)
339337
find_package(GLEW REQUIRED)
340338
target_link_libraries(3rdparty_glew INTERFACE GLEW::GLEW)
341339
endif()

rpcs3/Emu/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ target_sources(rpcs3_emu PRIVATE
545545
RSX/rsx_vertex_data.cpp
546546
)
547547

548-
if(NOT ANDROID)
548+
if(NOT ANDROID AND NOT APPLE)
549549
target_sources(rpcs3_emu PRIVATE
550550
RSX/GL/GLCommonDecompiler.cpp
551551
RSX/GL/GLCompute.cpp

0 commit comments

Comments
 (0)