From 07833e235ffb95ef82ecda3f61d3b513212deaff Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 20 Jan 2020 18:09:28 -0800 Subject: [PATCH] Archive Sunshine builds for Windows --- CMakeLists.txt | 6 +++++- appveyor.yml | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6afd128d..a4661426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,6 +118,10 @@ else() list(APPEND SUNSHINE_COMPILE_OPTIONS -O3) endif() +if(NOT SUNSHINE_ROOT) + set(SUNSHINE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) +endif() + list(APPEND SUNSHINE_EXTERNAL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} stdc++fs @@ -128,7 +132,7 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES ${Boost_LIBRARIES} ${PLATFORM_LIBRARIES}) -add_definitions(-DSUNSHINE_ASSETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/assets") +add_definitions(-DSUNSHINE_ASSETS_DIR="${SUNSHINE_ROOT}/assets") add_executable(sunshine ${SUNSHINE_TARGET_FILES}) target_link_libraries(sunshine ${SUNSHINE_EXTERNAL_LIBRARIES}) target_compile_definitions(sunshine PUBLIC ${SUNSHINE_DEFINITIONS}) diff --git a/appveyor.yml b/appveyor.yml index 046629db..53a2558f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,8 +21,16 @@ before_build: - cd build build_script: + - cmd: set OLDPATH=%PATH% - cmd: set PATH=C:\msys64\mingw64\bin - sh: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. - - cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENSSL_ROOT_DIR=C:\OpenSSL-v111-Win64 -G "MinGW Makefiles" .. + - cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPENSSL_ROOT_DIR=C:\OpenSSL-v111-Win64 -DSUNSHINE_ROOT=. -G "MinGW Makefiles" .. - sh: make -j$(nproc) - - cmd: mingw32-make -j2 \ No newline at end of file + - cmd: mingw32-make -j2 + - cmd: set PATH=%OLDPATH% + +after_build: + - cmd: 7z a Sunshine-Windows.zip C:\msys64\mingw64\bin\*.dll + - cmd: 7z a Sunshine-Windows.zip ..\assets\ + - cmd: 7z a Sunshine-Windows.zip sunshine.exe + - cmd: appveyor PushArtifact Sunshine-Windows.zip \ No newline at end of file