File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
66export HOMEBREW_NO_ENV_HINTS=1
77export 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
1010brew unlink --quiet ffmpeg qtbase qtsvg qtdeclarative
1111
1212brew link -f --quiet " llvm@$LLVM_COMPILER_VER " ffmpeg@5
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ brew install -f --overwrite --quiet ccache "llvm@$LLVM_COMPILER_VER"
1010brew link -f --overwrite --quiet " llvm@$LLVM_COMPILER_VER "
1111# shellcheck disable=SC3009
1212arch -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
1414arch -x86_64 /usr/local/bin/brew unlink --quiet ffmpeg qtbase qtsvg qtdeclarative
1515arch -x86_64 /usr/local/bin/brew link -f --overwrite --quiet " llvm@$LLVM_COMPILER_VER " ffmpeg@5
1616
Original file line number Diff line number Diff 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
337335add_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 )
341339endif ()
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments