izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from cgutman/appveyor

Browse Source 
Add AppVeyor CI for Windows
This commit is contained in:
loki-47-6F-64
2020-01-19 11:40:50 +01:00
committed by GitHub
parent 62ac962996 1ff3445209
commit 923c988d92
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -35,7 +35,6 @@ if(WIN32)
set_source_files_properties(ViGEmClient/src/ViGEmClient.cpp PROPERTIES COMPILE_DEFINITIONS "UNICODE=1;ERROR_INVALID_DEVICE_OBJECT_PARAMETER=650") set_source_files_properties(ViGEmClient/src/ViGEmClient.cpp PROPERTIES COMPILE_DEFINITIONS "UNICODE=1;ERROR_INVALID_DEVICE_OBJECT_PARAMETER=650")
set_source_files_properties(ViGEmClient/src/ViGEmClient.cpp PROPERTIES COMPILE_FLAGS "-Wno-unknown-pragmas -Wno-misleading-indentation -Wno-class-memaccess") set_source_files_properties(ViGEmClient/src/ViGEmClient.cpp PROPERTIES COMPILE_FLAGS "-Wno-unknown-pragmas -Wno-misleading-indentation -Wno-class-memaccess")
else() else()
set(Boost_USE_STATIC_LIBS ON)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
set(PLATFORM_TARGET_FILES set(PLATFORM_TARGET_FILES
sunshine/platform/linux.cpp sunshine/platform/linux.cpp
@@ -58,6 +57,7 @@ else()
/usr/include/libevdev-1.0) /usr/include/libevdev-1.0)
endif() endif()
set(Boost_USE_STATIC_LIBS ON)
find_package(Boost COMPONENTS log filesystem REQUIRED) find_package(Boost COMPONENTS log filesystem REQUIRED)
set(SUNSHINE_TARGET_FILES set(SUNSHINE_TARGET_FILES

22
appveyor.yml
View File

@@ -1,4 +1,6 @@
image: Ubuntu image:
- Ubuntu
- Visual Studio 2019
environment: environment:
matrix: matrix:
@@ -6,11 +8,12 @@ environment:
- BUILD_TYPE: Release - BUILD_TYPE: Release
install: install:
- sudo add-apt-repository ppa:hnakamur/icu - sh: sudo add-apt-repository ppa:hnakamur/icu
- sudo add-apt-repository ppa:hnakamur/boost - sh: sudo add-apt-repository ppa:hnakamur/boost
- sudo apt update - sh: sudo apt update
- sudo apt install -y cmake libssl-dev libavdevice-dev libboost-thread1.67-dev libboost-filesystem1.67-dev libboost-log1.67-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev - sh: sudo apt install -y cmake libssl-dev libavdevice-dev libboost-thread1.67-dev libboost-filesystem1.67-dev libboost-log1.67-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
- sudo update-alternatives --set gcc /usr/bin/gcc-8 - sh: sudo update-alternatives --set gcc /usr/bin/gcc-8
- cmd: C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-boost"
before_build: before_build:
- git submodule update --init --recursive - git submodule update --init --recursive
@@ -18,5 +21,8 @@ before_build:
- cd build - cd build
build_script: build_script:
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. - cmd: set PATH=C:\msys64\mingw64\bin
- make -j$(nproc) - sh: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
- cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENSSL_ROOT_DIR=C:\OpenSSL-v111-Win64 -G "MinGW Makefiles" ..
- sh: make -j$(nproc)
- cmd: mingw32-make -j2