From a1970eb009002686e8fa7797d6b8e8bc4eec7edd Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sun, 21 Apr 2019 15:33:26 +0500
Subject: Fixed compilation in MSVC v142

---
 src/Shader.hpp | 1 +
 src/Socket.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Shader.hpp b/src/Shader.hpp
index d70d394..8e1ce9e 100644
--- a/src/Shader.hpp
+++ b/src/Shader.hpp
@@ -2,6 +2,7 @@
 
 #include <map>
 #include <vector>
+#include <string>
 
 #include <GL/glew.h>
 #include <glm/glm.hpp>
diff --git a/src/Socket.cpp b/src/Socket.cpp
index 0effb3e..b3de080 100644
--- a/src/Socket.cpp
+++ b/src/Socket.cpp
@@ -1,6 +1,7 @@
 #include "Socket.hpp"
 
 #include <thread>
+#include <stdexcept>
 
 Socket::Socket(std::string address, unsigned short port) {    
     if (SDLNet_Init() == -1)
-- 
cgit v1.2.3


From 8dc104e0b7f99ff6f073d5e0c79b27bbc57ee832 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sun, 21 Apr 2019 15:34:04 +0500
Subject: Added manifest file for HiDPI-scaling

---
 CMakeLists.txt   | 3 ++-
 src/app.manifest | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 src/app.manifest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5c3a85..ac8e5c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,11 @@ endif()
 # SOURCES
 ##########
 
+file(GLOB_RECURSE MANIFEST "./src/*.manifest")
 file(GLOB_RECURSE SOURCES "./src/*.cpp")
 file(GLOB_RECURSE HEADERS "./src/*.hpp")
 
-add_executable(AltCraft ${HEADERS} ${SOURCES})
+add_executable(AltCraft ${HEADERS} ${SOURCES} ${MANIFEST})
 
 ################
 # CONFIGURATION
diff --git a/src/app.manifest b/src/app.manifest
new file mode 100644
index 0000000..26b3834
--- /dev/null
+++ b/src/app.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
-- 
cgit v1.2.3