summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-04-21 12:54:04 +0200
committerGitHub <noreply@github.com>2019-04-21 12:54:04 +0200
commit96cec9fe0e5ffcdca9536e40b56509582bedd0df (patch)
tree70b6fb94553c4a74f21fbf743ed42257139bfe84
parentUpdate README.md (diff)
parentAdded manifest file for HiDPI-scaling (diff)
downloadAltCraft-96cec9fe0e5ffcdca9536e40b56509582bedd0df.tar
AltCraft-96cec9fe0e5ffcdca9536e40b56509582bedd0df.tar.gz
AltCraft-96cec9fe0e5ffcdca9536e40b56509582bedd0df.tar.bz2
AltCraft-96cec9fe0e5ffcdca9536e40b56509582bedd0df.tar.lz
AltCraft-96cec9fe0e5ffcdca9536e40b56509582bedd0df.tar.xz
AltCraft-96cec9fe0e5ffcdca9536e40b56509582bedd0df.tar.zst
AltCraft-96cec9fe0e5ffcdca9536e40b56509582bedd0df.zip
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/Shader.hpp1
-rw-r--r--src/Socket.cpp1
-rw-r--r--src/app.manifest8
4 files changed, 12 insertions, 1 deletions
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/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)
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