RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

Remove libopengl.so.0 hack, and use LEGACY CMake OpenGL option for AppImage builds (#10234)

Browse Source
This commit is contained in:
Zion 2021-05-06 19:14:31 -07:00 committed by GitHub
parent f56ecb6d3f
commit a043e95d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/build-linux.sh
View File

@ -51,6 +51,7 @@ cmake .. \
-DCMAKE_AR="$AR" \ -DCMAKE_AR="$AR" \
-DCMAKE_RANLIB="$RANLIB" \ -DCMAKE_RANLIB="$RANLIB" \
-DUSE_SYSTEM_CURL=ON \ -DUSE_SYSTEM_CURL=ON \
-DOpenGL_GL_PREFERENCE=LEGACY \
-G Ninja -G Ninja
ninja; build_status=$?; ninja; build_status=$?;

1
.ci/deploy-linux.sh
View File

@ -13,7 +13,6 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
ls ./appdir/usr/lib/ ls ./appdir/usr/lib/
rm -r ./appdir/usr/share/doc rm -r ./appdir/usr/share/doc
cp "$(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1)" ./appdir/usr/lib/libnsl.so.1 cp "$(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1)" ./appdir/usr/lib/libnsl.so.1
cp "$(readlink -f /usr/lib/x86_64-linux-gnu/libOpenGL.so.0)" ./appdir/usr/lib/libOpenGL.so.0
export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH} export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH}
# Embed newer libstdc++ for distros that don't come with it (ubuntu 16.04) # Embed newer libstdc++ for distros that don't come with it (ubuntu 16.04)

6
3rdparty/CMakeLists.txt vendored
View File

@ -146,8 +146,10 @@ target_include_directories(3rdparty_cereal INTERFACE cereal/include)
# OpenGL # OpenGL
# Prefer GLVND for OpenGL rather than legacy # Prefer GLVND for OpenGL rather than legacy, unless it's been defined elsewhere, in the case of AppImage builds
set(OpenGL_GL_PREFERENCE GLVND) if(NOT DEFINED OpenGL_GL_PREFERENCE)
set(OpenGL_GL_PREFERENCE GLVND)
endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
add_library(3rdparty_opengl INTERFACE) add_library(3rdparty_opengl INTERFACE)