arch compability fixes and unwarning changes
This commit is contained in:
parent
a5dc187481
commit
ac0408d42a
2
.gitignore
vendored
2
.gitignore
vendored
@ -13,6 +13,8 @@ Debug/voxel_engine
|
||||
/worlds/**/*
|
||||
/settings.toml
|
||||
/controls.json
|
||||
/controls.toml
|
||||
/latest.log
|
||||
|
||||
/.idea
|
||||
.vscode
|
||||
|
||||
@ -120,7 +120,6 @@ else()
|
||||
set(LUA_LIBRARIES ${LUAJIT_LIBRARIES})
|
||||
set(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIRS})
|
||||
find_package(PNG REQUIRED)
|
||||
find_package(Lua REQUIRED)
|
||||
set(PNGLIB PNG::PNG)
|
||||
set(VORBISLIB ${VORBIS_LDFLAGS})
|
||||
endif()
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#include "TextBox.hpp"
|
||||
|
||||
#include <utility>
|
||||
#include <algorithm>
|
||||
|
||||
#include "Label.hpp"
|
||||
#include "../../core/DrawContext.hpp"
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <filesystem>
|
||||
#include <algorithm>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@ -10,6 +10,8 @@
|
||||
#include "scripting/scripting.hpp"
|
||||
#include "../interfaces/Object.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
static debug::Logger logger("level-control");
|
||||
|
||||
LevelController::LevelController(EngineSettings& settings, std::unique_ptr<Level> level)
|
||||
|
||||
@ -24,6 +24,8 @@
|
||||
#include "../core_defs.hpp"
|
||||
#include "../settings.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
const float CAM_SHAKE_OFFSET = 0.025f;
|
||||
const float CAM_SHAKE_OFFSET_Y = 0.031f;
|
||||
const float CAM_SHAKE_SPEED = 1.75f;
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
#include <filesystem>
|
||||
#include <algorithm>
|
||||
|
||||
static int l_pack_get_folder(lua_State* L) {
|
||||
std::string packName = lua_tostring(L, 1);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user