diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d07c6d6..353dd631 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(DAWN_BUILDING dawnpokergame) cmake_minimum_required(VERSION 3.13) set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD_REQUIRED ON) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") diff --git a/src/dawn/dawnlibs.hpp b/src/dawn/dawnlibs.hpp index 669efec9..d11591cc 100644 --- a/src/dawn/dawnlibs.hpp +++ b/src/dawn/dawnlibs.hpp @@ -29,6 +29,7 @@ extern "C" { #include <map> #include <array> #include <stb_truetype.h> +#include <memory> // #include <iterator> // #include <algorithm> // #include <string> diff --git a/src/dawn/display/Transform.hpp b/src/dawn/display/Transform.hpp index d8fda442..50d76844 100644 --- a/src/dawn/display/Transform.hpp +++ b/src/dawn/display/Transform.hpp @@ -139,5 +139,7 @@ namespace Dawn { * Dispose and clenaup this transform, also removes self from parent. */ ~Transform(); + + friend SceneItem; }; } \ No newline at end of file diff --git a/src/dawn/ui/UILabel.hpp b/src/dawn/ui/UILabel.hpp index 28bd78c8..942f8e4e 100644 --- a/src/dawn/ui/UILabel.hpp +++ b/src/dawn/ui/UILabel.hpp @@ -33,7 +33,7 @@ namespace Dawn { struct Color textColor = COLOR_MAGENTA; UILabel(UICanvas &canvas); - void drawSelf(UIShader &shader, glm::mat4 selfTransform); + void drawSelf(UIShader &shader, glm::mat4 selfTransform) override; /** * Returns the current text that the label has.