diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-06 20:09:09 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-06 20:09:09 +0100 |
| commit | 81de5e68ba6cf5cd8bc64c3fc0eecef84c417b61 (patch) | |
| tree | 144b0e9efecd4c10d6d79a17b4bf571336d45961 /src/crepe/api/Config.h | |
| parent | 5eedba3a070c3a7a4f27ae3ec7dd41812695f7e9 (diff) | |
| parent | fdb4c99e139a264d4e15e6913a3756fc6cccb2f2 (diff) | |
Merge branch 'master' into niels/decoupling_pixel_and_pos
Diffstat (limited to 'src/crepe/api/Config.h')
| -rw-r--r-- | src/crepe/api/Config.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h index f1bca62..a9745c3 100644 --- a/src/crepe/api/Config.h +++ b/src/crepe/api/Config.h @@ -1,8 +1,10 @@ #pragma once +#include <string> + #include "../util/Log.h" + #include "types.h" -#include <string> namespace crepe { @@ -69,7 +71,6 @@ public: //! default screen size in pixels ivec2 default_size = {1280, 720}; std::string window_title = "Jetpack joyride clone"; - } window_settings; //! Asset loading options |