diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 46eccb7eb5..9dada52c7c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -320,6 +320,7 @@ jobs: run: | mkdir build cd build + export LIBRARY_PATH=/usr/lib/ cmake -DQt5_DIR=$(brew --prefix qt)/lib/cmake/Qt5 -DENABLE_NOGUI=false .. make -j7 - name: "Package Netplay" @@ -384,6 +385,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir build + export LD_LIBRARY_PATH=/usr/lib/ cd build cmake -DIS_PLAYBACK=true -DQt5_DIR=$(brew --prefix qt)/lib/cmake/Qt5 -DENABLE_NOGUI=false .. make -j7 diff --git a/CMakeLists.txt b/CMakeLists.txt index 230670fdec..f2e2a7fa99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -626,7 +626,7 @@ else() endif() pkg_search_module(ZSTD QUIET libzstd) -if(ZSTD_FOUND) +if(ZSTD_FOUND AND NOT APPLE) message(STATUS "Using shared zstd") else() check_vendoring_approved(zstd) diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index ff4b7ccd7e..e0fc41d3cb 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -32,6 +32,7 @@ #include "VideoCommon/IconsFontAwesome4.h" extern std::unique_ptr g_playbackStatus; +extern template IMGUI_API float ImGui::SliderCalcRatioFromValueT(ImGuiDataType data_type, int v, int v_min, int v_max, float power, float linear_zero_pos); #endif namespace OSD