From 44f86dd3e53d689caebe935198ff00b76112ab18 Mon Sep 17 00:00:00 2001 From: loki Date: Thu, 23 Jan 2020 12:46:09 +0100 Subject: [PATCH] Start Steam in Big-Picture mode on Windows --- CMakeLists.txt | 5 ++++- assets/{apps.json => apps_linux.json} | 0 sunshine/config.cpp | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) rename assets/{apps.json => apps_linux.json} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d862fe3d..e8d4dbe3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ find_package(OpenSSL REQUIRED) find_package(FFmpeg REQUIRED) if(WIN32) + list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_windows.json") include_directories( ViGEmClient/include) set(PLATFORM_TARGET_FILES @@ -36,6 +37,8 @@ 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_FLAGS "-Wno-unknown-pragmas -Wno-misleading-indentation -Wno-class-memaccess") else() + list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_linux.json") + find_package(X11 REQUIRED) set(PLATFORM_TARGET_FILES sunshine/platform/linux.cpp @@ -133,7 +136,7 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES ${Boost_LIBRARIES} ${PLATFORM_LIBRARIES}) -add_definitions(-DSUNSHINE_ASSETS_DIR="${SUNSHINE_ROOT}/assets") +list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_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/assets/apps.json b/assets/apps_linux.json similarity index 100% rename from assets/apps.json rename to assets/apps_linux.json diff --git a/sunshine/config.cpp b/sunshine/config.cpp index 03dc6188..429b88a2 100644 --- a/sunshine/config.cpp +++ b/sunshine/config.cpp @@ -12,7 +12,7 @@ #define PRIVATE_KEY_FILE CA_DIR "/cakey.pem" #define CERTIFICATE_FILE CA_DIR "/cacert.pem" -#define APPS_JSON SUNSHINE_ASSETS_DIR "/apps.json" +#define APPS_JSON_PATH SUNSHINE_ASSETS_DIR "/" APPS_JSON namespace config { using namespace std::literals; video_t video { @@ -31,7 +31,7 @@ audio_t audio {}; stream_t stream { 2s, // ping_timeout - APPS_JSON, + APPS_JSON_PATH, 13 // fecPercentage };