diff --git a/CEFInjectLib/CEFInjectLib.vcxproj b/CEFInjectLib/CEFInjectLib.vcxproj index 45991ac..cd08f46 100644 --- a/CEFInjectLib/CEFInjectLib.vcxproj +++ b/CEFInjectLib/CEFInjectLib.vcxproj @@ -120,7 +120,7 @@ Level3 true - SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) + SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) true NotUsing pch.h @@ -142,7 +142,7 @@ true true true - SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions) + SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions) true NotUsing pch.h diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc index 1946067..3d55738 100644 --- a/GlosSIConfig/Resource.rc +++ b/GlosSIConfig/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,2,0067006100730 - PRODUCTVERSION 0,1,2,0067006100730 + FILEVERSION 0,1,2,0072000000004 + PRODUCTVERSION 0,1,2,0072000000004 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - Config" - VALUE "FileVersion", "0.1.2.0-67-g61ff730" + VALUE "FileVersion", "0.1.2.0-72-gaebb0a4" VALUE "InternalName", "GlosSIConfig" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSIConfig.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.1.2.0-67-g61ff730" + VALUE "ProductVersion", "0.1.2.0-72-gaebb0a4" END END BLOCK "VarFileInfo" @@ -130,6 +130,10 @@ IDI_ICON1 ICON "..\GlosSI_Icon.ico" + + + + diff --git a/GlosSITarget/GlosSITarget.vcxproj b/GlosSITarget/GlosSITarget.vcxproj index 2d09a17..a61f02d 100644 --- a/GlosSITarget/GlosSITarget.vcxproj +++ b/GlosSITarget/GlosSITarget.vcxproj @@ -81,16 +81,16 @@ true - ..\deps\SFML\include;..\deps\WinReg;..\deps\spdlog\include;..\deps\ValveFileVDF;..\deps\subhook;..\deps\ViGEmClient\include;..\deps\imgui;..\deps\imgui-sfml;..\deps\json\include;..\deps\traypp\tray\include;..\deps\cpp-httplib;$(ExternalIncludePath) - ..\deps\SFML\out\Debug\lib\Debug;..\deps\ViGEmClient\lib\debug\x64;$(LibraryPath) + ..\deps\SFML\include;..\deps\WinReg;..\deps\spdlog\include;..\deps\ValveFileVDF;..\deps\subhook;..\deps\ViGEmClient\include;..\deps\imgui;..\deps\imgui-sfml;..\deps\json\include;..\deps\traypp\tray\include;..\deps\cpp-httplib;..\CEFInjectLib;$(ExternalIncludePath) + ..\deps\SFML\out\Debug\lib\Debug;..\deps\ViGEmClient\lib\debug\x64;..\x64\Debug;$(LibraryPath) false true ResourceCompile false - ..\deps\SFML\include;..\deps\WinReg;..\deps\spdlog\include;..\deps\ValveFileVDF;..\deps\subhook;..\deps\ViGEmClient\include;..\deps\imgui;..\deps\imgui-sfml;..\deps\json\include;..\deps\traypp\tray\include;..\deps\cpp-httplib;$(ExternalIncludePath) - ..\deps\SFML\out\Release\lib\RelWithDebInfo;..\deps\ViGEmClient\lib\release\x64;$(LibraryPath) + ..\deps\SFML\include;..\deps\WinReg;..\deps\spdlog\include;..\deps\ValveFileVDF;..\deps\subhook;..\deps\ViGEmClient\include;..\deps\imgui;..\deps\imgui-sfml;..\deps\json\include;..\deps\traypp\tray\include;..\deps\cpp-httplib;..\CEFInjectLib;$(ExternalIncludePath) + ..\deps\SFML\out\Release\lib\RelWithDebInfo;..\deps\ViGEmClient\lib\release\x64;..\x64\Release;$(LibraryPath) ResourceCompile true @@ -126,7 +126,7 @@ Level3 true - _DEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions) + _DEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions);_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS true stdcpp20 true @@ -136,7 +136,7 @@ Windows true - hid.lib;Cfgmgr32.lib;opengl32.lib;sfml-window-d.lib;sfml-system-d.lib;sfml-graphics-d.lib;dwmapi.lib;xinput.lib;setupapi.lib;ViGEmClient.lib;Dbghelp.lib;%(AdditionalDependencies) + hid.lib;Cfgmgr32.lib;opengl32.lib;CEFInjectLib.lib;sfml-window-d.lib;sfml-system-d.lib;sfml-graphics-d.lib;dwmapi.lib;xinput.lib;setupapi.lib;ViGEmClient.lib;Dbghelp.lib;%(AdditionalDependencies) PerMonitorHighDPIAware @@ -152,7 +152,7 @@ true true true - NDEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions) + NDEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions);_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS true stdcpp20 Speed @@ -164,7 +164,7 @@ true true true - hid.lib;Cfgmgr32.lib;opengl32.lib;sfml-window.lib;sfml-system.lib;sfml-graphics.lib;dwmapi.lib;XINPUT.lib;setupapi.lib;ViGEmClient.lib;Dbghelp.lib;%(AdditionalDependencies) + hid.lib;Cfgmgr32.lib;opengl32.lib;CEFInjectLib.lib;sfml-window.lib;sfml-system.lib;sfml-graphics.lib;dwmapi.lib;XINPUT.lib;setupapi.lib;ViGEmClient.lib;Dbghelp.lib;%(AdditionalDependencies) PerMonitorHighDPIAware diff --git a/GlosSITarget/Resource.rc b/GlosSITarget/Resource.rc index ee0b803..479751b 100644 --- a/GlosSITarget/Resource.rc +++ b/GlosSITarget/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,2,0068000002000 - PRODUCTVERSION 0,1,2,0068000002000 + FILEVERSION 0,1,2,0073004510400 + PRODUCTVERSION 0,1,2,0073004510400 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - SteamTarget" - VALUE "FileVersion", "0.1.2.0-68-g0f02eca" + VALUE "FileVersion", "0.1.2.0-73-g451c4f0" VALUE "InternalName", "GlosSITarget" VALUE "LegalCopyright", "Copyright (C) 2021-2022 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.1.2.0-68-g0f02eca" + VALUE "ProductVersion", "0.1.2.0-73-g451c4f0" END END BLOCK "VarFileInfo" @@ -258,6 +258,22 @@ IDI_ICON1 ICON "..\\GlosSI_Icon.ico" + + + + + + + + + + + + + + + + diff --git a/GlosSITarget/SteamTarget.cpp b/GlosSITarget/SteamTarget.cpp index f09b0c4..092652e 100644 --- a/GlosSITarget/SteamTarget.cpp +++ b/GlosSITarget/SteamTarget.cpp @@ -56,11 +56,13 @@ int SteamTarget::run() auto closeBPM = false; auto closeBPMTimer = sf::Clock{}; if (!SteamOverlayDetector::IsSteamInjected()) { - if (Settings::common.allowStandAlone) { + if (Settings::common.allowGlobalMode) { spdlog::warn("GlosSI not launched via Steam.\nEnabling EXPERIMENTAL global controller and overlay..."); - if (Settings::common.standaloneModeGameId == L"") { + if (Settings::common.globalModeGameId == L"") { spdlog::error("No game id set for standalone mode. Controller will use desktop-config!"); } + } + } auto steam_tweaks = CEFInject::SteamTweaks(); steam_tweaks.setAutoInject(true); diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi index ae77fb6..bd6a8e2 100644 --- a/Installer/Installer.nsi +++ b/Installer/Installer.nsi @@ -3,7 +3,7 @@ !define APP_NAME "GlosSI" !define COMP_NAME "Peter Repukat - Flatspotsoftware" !define WEB_SITE "https://glossi.flatspot.pictures/" -!define VERSION "0.1.2.0-68-g0f02eca" +!define VERSION "0.1.2.0-73-g451c4f0" !define COPYRIGHT "Peter Repukat - FlatspotSoftware © 2017-2022" !define DESCRIPTION "SteamInput compatibility tool" !define INSTALLER_NAME "GlosSI-Installer.exe" @@ -239,6 +239,11 @@ SectionEnd + + + + +