diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/CApi.h | 4 | ||||
| -rw-r--r-- | src/LuaApi.h | 4 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f134e83..a4d100b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.0) project(dng) set(CMAKE_CXX_STANDARD 20) @@ -7,8 +7,10 @@ find_package(Lua REQUIRED) # check what features I use and assert minimum if (LUA_VERSION_STRING VERSION_LESS "5.4") - message(FATAL_ERROR "Invalid Lau version: ${LUA_VERSION_STRING} - must be >= 5.4") + message(FATAL_ERROR "Invalid Lau version: ${LUA_VERSION_STRING} - must be >= 5.4") endif() +include_directories(${LUA_INCLUDE_DIR}) + #set(SFML_LIBRARIES sfml-system sfml-window sfml-graphics) #find_package(SFML 2.5 REQUIRED COMPONENTS system window graphics) @@ -3,7 +3,7 @@ #include "Level.h" #include "Scene.h" -#include <lua.hpp> +#include "lua.hpp" #include <memory> extern std::shared_ptr<Level> lvl; @@ -200,4 +200,4 @@ void init_c_api(lua_State *L) { lua_register(L, "c_get_treasures", c_get_treasures); } -#endif // DNG_CAPI_H
\ No newline at end of file +#endif // DNG_CAPI_H diff --git a/src/LuaApi.h b/src/LuaApi.h index cb68e36..088832c 100644 --- a/src/LuaApi.h +++ b/src/LuaApi.h @@ -2,7 +2,7 @@ #define DNG_LUA_API_H #include <iostream> -#include <lua.hpp> +#include "lua.hpp" struct LState { lua_State *onkeypress; @@ -86,4 +86,4 @@ bool lua_onwin(lua_State *L) { return lua_dofn(L, "onWin"); } bool lua_onloss(lua_State *L) { return lua_dofn(L, "onLoss"); } -#endif // DNG_LUA_API_H
\ No newline at end of file +#endif // DNG_LUA_API_H diff --git a/src/main.cpp b/src/main.cpp index a4183f7..3f464e1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,7 +4,7 @@ //#include <SFML/Graphics.hpp> #include <filesystem> #include <iostream> -#include <lua.hpp> +#include "lua.hpp" const char *DEFAULT_PROC = "include/defaults.lua"; |