Merge pull request #6 from devZoGok/bf5-build-on-windows

Bf5 build on windows

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "external/glfw"]
 	path = external/glfw
 	url = https://github.com/glfw/glfw
-[submodule "external/lua"]
-	path = external/lua
-	url = https://github.com/lua/lua
+[submodule "external/lua-cmake"]
+	path = external/lua-cmake
+	url = https://github.com/lubgr/lua-cmake

CMakeLists.txt

@@ -9,23 +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)
-
-include_directories(../${GLFW_DIR}/include/GLFW)
-
-set(LUA_LIB_DIR ${LUA_DIR})
-include_directories(${LUA_DIR})
-link_directories(${LUA_DIR})
-
-add_library(gameBase STATIC ${states} ${core} ${util})
-set(GLFW_DIR ../vb01/external/glfw)
 set(LIB_NAME gameBase)
+add_library(${LIB_NAME} STATIC ${states} ${core} ${util})
 
-set(GLFW_LIB_DIR ../vb01/build/external/glfw/src)
+set(GLFW_DIR external/glfw)
+set(GLFW_LIB_DIR build/external/glfw/src)
 target_include_directories(${LIB_NAME} PUBLIC ${GLFW_DIR}/include/GLFW)
 target_link_directories(${LIB_NAME} PUBLIC ${GLFW_LIB_DIR})
 
-target_link_libraries(${LIB_NAME} lua)
-target_link_libraries(gameBase glfw)
-
+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

@@ -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>