diff --git a/.gitmodules b/.gitmodules
index 6a3c5b3..1c4ef8f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4ba3c2..a1f8509 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,24 +3,29 @@ project(gameBase)
 
 set(CMAKE_BUILD_TYPE Debug)
 cmake_policy(SET CMP0015 NEW)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 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-5.4.4/src)
+set(LUA_DIR external/lua)
 
 include_directories(../${GLFW_DIR}/include/GLFW)
 
-#set(LUA_LIB_DIR ${LUA_DIR})
+set(LUA_LIB_DIR ${LUA_DIR})
 include_directories(${LUA_DIR})
 link_directories(${LUA_DIR})
 
-add_library(gameBase ${states} ${core} ${util})
-
+add_library(gameBase STATIC ${states} ${core} ${util})
+set(GLFW_DIR ../vb01/external/glfw)
 set(LIB_NAME gameBase)
 
-link_directories(../../build/external/${GLFW_DIR}/src)
-target_link_libraries(${LIB_NAME} 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})
+
 target_link_libraries(${LIB_NAME} lua)
+target_link_libraries(gameBase glfw)
+
diff --git a/external/lua b/external/lua
new file mode 160000
index 0000000..8426d9b
--- /dev/null
+++ b/external/lua
@@ -0,0 +1 @@
+Subproject commit 8426d9b4d4df1da3c5b2d759e509ae1c50a86667