YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiled (segfault on close)

Browse Source
This commit is contained in:
Dominic Masters
2022-10-31 00:03:28 -07:00
parent 234866ee8f
commit f5e8dd9a8e
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -9,7 +9,7 @@ set(DAWN_BUILDING dawnpokergame)
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")

1
src/dawn/dawnlibs.hpp
View File

@ -29,6 +29,7 @@ extern "C" {
#include <map> #include <map>
#include <array> #include <array>
#include <stb_truetype.h> #include <stb_truetype.h>
#include <memory>
// #include <iterator> // #include <iterator>
// #include <algorithm> // #include <algorithm>
// #include <string> // #include <string>

2
src/dawn/display/Transform.hpp
View File

@ -139,5 +139,7 @@ namespace Dawn {
* Dispose and clenaup this transform, also removes self from parent. * Dispose and clenaup this transform, also removes self from parent.
*/ */
~Transform(); ~Transform();
friend SceneItem;
}; };
} }

2
src/dawn/ui/UILabel.hpp
View File

@ -33,7 +33,7 @@ namespace Dawn {
struct Color textColor = COLOR_MAGENTA; struct Color textColor = COLOR_MAGENTA;
UILabel(UICanvas &canvas); 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. * Returns the current text that the label has.