mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix zstd linking

Browse source
This commit is contained in:
Nikhil Narayana 2020-07-18 03:10:42 -04:00
commit 74221c16c8
No known key found for this signature in database
GPG key ID: E263B4B4644E576B
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View file

@ -320,6 +320,7 @@ jobs:
run: | run: |
mkdir build mkdir build
cd build cd build
export LIBRARY_PATH=/usr/lib/
cmake -DQt5_DIR=$(brew --prefix qt)/lib/cmake/Qt5 -DENABLE_NOGUI=false .. cmake -DQt5_DIR=$(brew --prefix qt)/lib/cmake/Qt5 -DENABLE_NOGUI=false ..
make -j7 make -j7
- name: "Package Netplay" - name: "Package Netplay"
@ -384,6 +385,7 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
mkdir build mkdir build
export LD_LIBRARY_PATH=/usr/lib/
cd build cd build
cmake -DIS_PLAYBACK=true -DQt5_DIR=$(brew --prefix qt)/lib/cmake/Qt5 -DENABLE_NOGUI=false .. cmake -DIS_PLAYBACK=true -DQt5_DIR=$(brew --prefix qt)/lib/cmake/Qt5 -DENABLE_NOGUI=false ..
make -j7 make -j7

2
CMakeLists.txt
View file

@ -626,7 +626,7 @@ else()
endif() endif()
pkg_search_module(ZSTD QUIET libzstd) pkg_search_module(ZSTD QUIET libzstd)
if(ZSTD_FOUND) if(ZSTD_FOUND AND NOT APPLE)
message(STATUS "Using shared zstd") message(STATUS "Using shared zstd")
else() else()
check_vendoring_approved(zstd) check_vendoring_approved(zstd)

1
Source/Core/VideoCommon/OnScreenDisplay.cpp
View file

@ -32,6 +32,7 @@
#include "VideoCommon/IconsFontAwesome4.h" #include "VideoCommon/IconsFontAwesome4.h"
extern std::unique_ptr<SlippiPlaybackStatus> g_playbackStatus; extern std::unique_ptr<SlippiPlaybackStatus> g_playbackStatus;
extern template IMGUI_API float ImGui::SliderCalcRatioFromValueT<int, float>(ImGuiDataType data_type, int v, int v_min, int v_max, float power, float linear_zero_pos);
#endif #endif
namespace OSD namespace OSD