mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-02-22 21:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #530 from psyke83/restrict_boost_ver

Browse Source 
CMake: win32: fix linker errors with mingw boost 1.80.0-2
This commit is contained in:
ReenigneArcher 2022-12-10 08:11:23 -05:00 committed by GitHub
commit ed5ee24efb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/CI.yml vendored
View File

@ -217,7 +217,7 @@ jobs:
mv ./build/PKGBUILD ./artifacts/ mv ./build/PKGBUILD ./artifacts/
- name: Validate package - name: Validate package
uses: hapakaien/archlinux-package-action@v2.2.0 uses: LizardByte/archlinux-package-action@master
with: with:
path: artifacts path: artifacts
flags: '--syncdeps --noconfirm' flags: '--syncdeps --noconfirm'

3
CMakeLists.txt
View File

@ -86,6 +86,9 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CURL_STATIC_LDFLAGS} ${CURL_STATIC_CFLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CURL_STATIC_LDFLAGS} ${CURL_STATIC_CFLAGS}")
# Restrict Boost WinAPI version to work around 1.80 linker errors
ADD_DEFINITIONS(-DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7)
if(NOT DEFINED SUNSHINE_PREPARED_BINARIES) if(NOT DEFINED SUNSHINE_PREPARED_BINARIES)
set(SUNSHINE_PREPARED_BINARIES "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled/windows") set(SUNSHINE_PREPARED_BINARIES "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled/windows")
endif() endif()