devZoGok/gameBase
1
0
Fork 0
mirror of https://github.com/devZoGok/gameBase.git synced 2026-08-26 19:43:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaced lua.hpp include with externed *.h includes

Browse Source
This commit is contained in:
devZoGok
2023-08-04 19:12:20 +03:00
parent c9e9f64238
commit ed85534410
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -9
View File
@@ -9,20 +9,15 @@ set(states abstractAppState.cpp)
set(core inputManager.cpp mapping.h stateManager.cpp luaManager.cpp)
set(util util.cpp)
set(GLFW_DIR vb01/external/glfw)
set(LUA_DIR external/lua-cmake)
include_directories(../${GLFW_DIR}/include/GLFW)
set(LUA_LIB_DIR ${LUA_DIR})
add_subdirectory(${LUA_DIR})
set(LIB_NAME gameBase)
add_library(${LIB_NAME} STATIC ${states} ${core} ${util})
set(GLFW_DIR ../vb01/external/glfw)
set(GLFW_DIR external/glfw)
set(GLFW_LIB_DIR ../vb01/build/external/glfw/src)
target_include_directories(${LIB_NAME} PUBLIC ${GLFW_DIR}/include/GLFW)
target_link_directories(${LIB_NAME} PUBLIC ${GLFW_LIB_DIR})
set(LUA_DIR external/lua-cmake)
add_subdirectory(${LUA_DIR})
target_include_directories(${LIB_NAME} PUBLIC ${LUA_DIR}/external/upstream)
target_link_libraries(${LIB_NAME} glfw lua::lib)
luaManager.h
+5 -3
View File
@@ -1,9 +1,11 @@
#ifndef LUA_MANAGER_H
#define LUA_MANAGER_H
#include <lua.hpp>
#include <lauxlib.h>
#include <lualib.h>
extern "C"{
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
}
#include <string>
#include <vector>