diff --git a/CMakeLists.txt b/CMakeLists.txt index 086df5ce..0115a264 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,8 @@ find_package(Boost COMPONENTS log filesystem REQUIRED) list(APPEND SUNSHINE_COMPILE_OPTIONS -Wall -Wno-missing-braces -Wno-maybe-uninitialized -Wno-sign-compare) if(WIN32) + enable_language(RC) + set(CMAKE_RC_COMPILER windres) file( DOWNLOAD "https://github.com/TheElixZammuto/sunshine-prebuilt/releases/download/1.0.0/pre-compiled.zip" "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip" TIMEOUT 60 @@ -50,7 +52,12 @@ if(WIN32) include_directories(third-party/ViGEmClient/include) + if(NOT DEFINED SUNSHINE_ICON_PATH) + set(SUNSHINE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/sunshine.ico") + endif() + configure_file(sunshine/platform/windows/windows.rs.in windows.rc @ONLY) set(PLATFORM_TARGET_FILES + "${CMAKE_CURRENT_BINARY_DIR}/windows.rc" sunshine/platform/windows/publish.cpp sunshine/platform/windows/misc.h sunshine/platform/windows/misc.cpp diff --git a/README.md b/README.md index 96f2894d..a25a3da0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +![Sunshine icon](gamepad.png "Sunshine") # Introduction Sunshine is a Gamestream host for Moonlight @@ -113,7 +114,7 @@ It's necessary to allow Sunshine to use KMS First you need to install [MSYS2](https://www.msys2.org), then startup "MSYS2 MinGW 64-bit" and install the following packages using `pacman -S`: - mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git mingw-w64-x86_64-make cmake make gcc + mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git mingw-w64-x86_64-make cmake make gcc ### Compilation: - `git clone https://github.com/loki-47-6F-64/sunshine.git --recursive` @@ -153,6 +154,7 @@ All shortcuts start with CTRL + ALT + SHIFT, just like Moonlight - [Moonlight](https://github.com/moonlight-stream) - [Looking-Glass](https://github.com/gnif/LookingGlass) (For showing me how to properly capture frames on Windows, saving me a lot of time :) - [Eretik](http://eretik.omegahg.com/) (For creating PolicyConfig.h, allowing me to change the default audio device on Windows programmatically) +- [Twitter emoji](https://github.com/twitter/twemoji/blob/master/LICENSE-GRAPHICS) (Sunshine's icon is made of twemoji) ## Application List: **Note:** You can change the Application List in the "Apps" section of the User Interface `https://xxx.xxx.xxx.xxx:47990/` diff --git a/appveyor.yml b/appveyor.yml index 7994c1ab..7a418aaa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ environment: BUILD_TYPE: Release install: - - 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-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" + - cmd: C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" before_build: - cmd: git submodule update --init --recursive diff --git a/gamepad.png b/gamepad.png new file mode 100644 index 00000000..274c7ced Binary files /dev/null and b/gamepad.png differ diff --git a/sunshine.ico b/sunshine.ico new file mode 100644 index 00000000..8cfdfed9 Binary files /dev/null and b/sunshine.ico differ diff --git a/sunshine/platform/windows/windows.rs.in b/sunshine/platform/windows/windows.rs.in new file mode 100644 index 00000000..1a56eeff --- /dev/null +++ b/sunshine/platform/windows/windows.rs.in @@ -0,0 +1 @@ +SuperDuperAmazing ICON DISCARDABLE "@SUNSHINE_ICON_PATH@" \ No newline at end of file