From 2a805b488b8d48dea253715b81d0dcbcc395dc3f Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Thu, 28 Oct 2021 12:28:20 +0200 Subject: [PATCH] Disable automatic include sorting... --- GlosSITarget/.clang-format | 3 ++- GlosSITarget/Overlay.h | 6 ++++-- GlosSITarget/OverlayLogSink.h | 4 ++-- GlosSITarget/Resource.rc | 12 ++++++++---- GlosSITarget/main.cpp | 7 ++++--- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/GlosSITarget/.clang-format b/GlosSITarget/.clang-format index dc813fd..b5e5b98 100644 --- a/GlosSITarget/.clang-format +++ b/GlosSITarget/.clang-format @@ -4,4 +4,5 @@ BreakBeforeBraces: "Stroustrup" AllowShortIfStatementsOnASingleLine: false IndentCaseLabels: false ColumnLimit: 0 -PointerAlignment: "Left" \ No newline at end of file +PointerAlignment: "Left" +SortIncludes: false \ No newline at end of file diff --git a/GlosSITarget/Overlay.h b/GlosSITarget/Overlay.h index e4e0a5c..63080fe 100644 --- a/GlosSITarget/Overlay.h +++ b/GlosSITarget/Overlay.h @@ -18,12 +18,14 @@ limitations under the License. #include #include -#include - #define IMGUI_USER_CONFIG "imconfig.h" #include "imgui-SFML.h" #include "imgui.h" +#include + +#include + class Overlay { public: Overlay(sf::RenderWindow& window, std::function on_close); diff --git a/GlosSITarget/OverlayLogSink.h b/GlosSITarget/OverlayLogSink.h index 234441d..5443264 100644 --- a/GlosSITarget/OverlayLogSink.h +++ b/GlosSITarget/OverlayLogSink.h @@ -1,8 +1,9 @@ #pragma once - +#include #include "Overlay.h" + namespace spdlog { namespace sinks { @@ -31,7 +32,6 @@ class overlay_sink : public spdlog::sinks::base_sink { { // Don't format log message. } - }; using overlay_sink_mt = overlay_sink; diff --git a/GlosSITarget/Resource.rc b/GlosSITarget/Resource.rc index be1fe8d..5c54f4a 100644 --- a/GlosSITarget/Resource.rc +++ b/GlosSITarget/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,0,0190104 - PRODUCTVERSION 0,0,0,0190104 + FILEVERSION 0,0,0,9303501 + PRODUCTVERSION 0,0,0,9303501 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - SteamTarget" - VALUE "FileVersion", "0.0.0.c19b1e4" + VALUE "FileVersion", "0.0.0.93c35f1" VALUE "InternalName", "GlosSITarget" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.0.0.c19b1e4" + VALUE "ProductVersion", "0.0.0.93c35f1" END END BLOCK "VarFileInfo" @@ -175,6 +175,10 @@ END + + + + diff --git a/GlosSITarget/main.cpp b/GlosSITarget/main.cpp index be693a3..c2a8fe8 100644 --- a/GlosSITarget/main.cpp +++ b/GlosSITarget/main.cpp @@ -18,13 +18,14 @@ limitations under the License. #include #endif +#include +#include +#include + #include "SteamTarget.h" #include "OverlayLogSink.h" #include "Settings.h" -#include -#include -#include #ifdef _WIN32 #ifdef CONSOLE