vb01 is now a direct dependency of the game

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "gameBase2"]
 	path = external/gameBase
 	url = https://github.com/devZoGok/gameBase
+[submodule "external/vb01"]
+	path = external/vb01
+	url = https://github.com/devZoGok/vb01

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.9)
-project(game)
+project(battleship)
 
 set(CMAKE_BUILD_TYPE Debug)
 cmake_policy(SET CMP0015 NEW)
@@ -14,12 +14,12 @@ set(aircraft jet.cpp demoJet.cpp missileJet.cpp)
 set(fx explosion.cpp)
 set(content player.cpp unit.cpp map.cpp ${ships} ${projectiles} ${aircraft} ${fx})
 
-set(FREETYPE_DIR external/vb01Gui/external/vb01/external/freetype)
 set(SFML_DIR external/SFML)
-set(VB01_DIR external/vb01Gui/external/vb01)
+set(VB01_DIR external/vb01)
+set(FREETYPE_DIR ${VB01_DIR}/external/freetype)
 set(VB01_GUI_DIR external/vb01Gui)
 set(GAME_BASE_DIR external/gameBase)
-set(GLFW_DIR ${GAME_BASE_DIR}/external/glfw/include/GLFW)
+set(GLFW_DIR ${VB01_DIR}/external/glfw/)
 set(GAME_NAME battleship)
 
 add_executable(${GAME_NAME} ${states} ${gui} ${core} ${content} ${util})
@@ -29,7 +29,7 @@ target_include_directories(${GAME_NAME} PUBLIC ${FREETYPE_DIR}/include)
 include_directories(external/vb01Gui/external/vb01/external/glm)
 include_directories(external/vb01Gui/external/vb01/external/glm/glm)
 
-#add_subdirectory(${VB01_DIR})
+add_subdirectory(${VB01_DIR})
 set(VB01_LIB_DIR ${VB01_DIR}/build)
 target_include_directories(${GAME_NAME} PUBLIC ${VB01_DIR})
 target_link_directories(${GAME_NAME} PUBLIC ${VB01_LIB_DIR})
@@ -49,9 +49,8 @@ set(SFML_LIB_DIR build/${SFML_DIR}/src)
 target_include_directories(${GAME_NAME} PUBLIC ${SFML_DIR}/include)
 target_link_directories(${GAME_NAME} PUBLIC ${SFML_LIB_DIR})
 
-#add_subdirectory(${GLFW_DIR})
 set(GLFW_LIB_DIR build/${GLFW_DIR}/src)
-target_include_directories(${GAME_NAME} PUBLIC ${GLFW_DIR}/include/GLFW)
+include_directories(${GLFW_DIR}/include/GLFW)
 target_link_directories(${GAME_NAME} PUBLIC ${GLFW_LIB_DIR})
 
 target_link_libraries(${GAME_NAME} vb01)