Disable automatic include sorting...

pull/130/head
Peter Repukat 3 years ago
parent 93c35f1e0b
commit 2a805b488b

@ -4,4 +4,5 @@ BreakBeforeBraces: "Stroustrup"
AllowShortIfStatementsOnASingleLine: false AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: false IndentCaseLabels: false
ColumnLimit: 0 ColumnLimit: 0
PointerAlignment: "Left" PointerAlignment: "Left"
SortIncludes: false

@ -18,12 +18,14 @@ limitations under the License.
#include <string> #include <string>
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#include <spdlog/spdlog.h>
#define IMGUI_USER_CONFIG "imconfig.h" #define IMGUI_USER_CONFIG "imconfig.h"
#include "imgui-SFML.h" #include "imgui-SFML.h"
#include "imgui.h" #include "imgui.h"
#include <chrono>
#include <spdlog/spdlog.h>
class Overlay { class Overlay {
public: public:
Overlay(sf::RenderWindow& window, std::function<void()> on_close); Overlay(sf::RenderWindow& window, std::function<void()> on_close);

@ -1,8 +1,9 @@
#pragma once #pragma once
#include <spdlog/spdlog.h>
#include "Overlay.h" #include "Overlay.h"
namespace spdlog { namespace spdlog {
namespace sinks { namespace sinks {
@ -31,7 +32,6 @@ class overlay_sink : public spdlog::sinks::base_sink<Mutex> {
{ {
// Don't format log message. // Don't format log message.
} }
}; };
using overlay_sink_mt = overlay_sink<std::mutex>; using overlay_sink_mt = overlay_sink<std::mutex>;

@ -51,8 +51,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,0,0190104 FILEVERSION 0,0,0,9303501
PRODUCTVERSION 0,0,0,0190104 PRODUCTVERSION 0,0,0,9303501
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "CompanyName", "Peter Repukat - FlatspotSoftware"
VALUE "FileDescription", "GlosSI - SteamTarget" VALUE "FileDescription", "GlosSI - SteamTarget"
VALUE "FileVersion", "0.0.0.c19b1e4" VALUE "FileVersion", "0.0.0.93c35f1"
VALUE "InternalName", "GlosSITarget" VALUE "InternalName", "GlosSITarget"
VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware"
VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "OriginalFilename", "GlosSITarget.exe"
VALUE "ProductName", "GlosSI" VALUE "ProductName", "GlosSI"
VALUE "ProductVersion", "0.0.0.c19b1e4" VALUE "ProductVersion", "0.0.0.93c35f1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@ -175,6 +175,10 @@ END

@ -18,13 +18,14 @@ limitations under the License.
#include <Windows.h> #include <Windows.h>
#endif #endif
#include <spdlog/sinks/basic_file_sink.h>
#include <spdlog/sinks/stdout_color_sinks.h>
#include <spdlog/spdlog.h>
#include "SteamTarget.h" #include "SteamTarget.h"
#include "OverlayLogSink.h" #include "OverlayLogSink.h"
#include "Settings.h" #include "Settings.h"
#include <spdlog/sinks/basic_file_sink.h>
#include <spdlog/sinks/stdout_color_sinks.h>
#include <spdlog/spdlog.h>
#ifdef _WIN32 #ifdef _WIN32
#ifdef CONSOLE #ifdef CONSOLE

Loading…
Cancel
Save