restructured dependencies

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "gameBase"]
+	path = gameBase
+	url = https://github.com/devZoGok/gameBase
+[submodule "external/gameBase"]
+	path = external/gameBase
+	url = https://github.com/devZoGok/gameBase
+[submodule "external/glfw"]
+	path = external/glfw
+	url = https://github.com/glfw/glfw
+[submodule "external/SFML"]
+	path = external/SFML
+	url = https://github.com/SFML/SFML
+[submodule "external/vb01Gui"]
+	path = external/vb01Gui
+	url = https://github.com/devZoGok/vb01Gui

CMakeLists.txt

@@ -4,16 +4,9 @@ project(game)
 set(CMAKE_BUILD_TYPE Debug)
 cmake_policy(SET CMP0015 NEW)
 
-include_directories(../vb01)
-include_directories(../vb01Gui)
-include_directories(/usr/include/freetype2)
-include_directories(/usr/include/GLFW)
-include_directories(/usr/include/glm)
-include_directories(/usr/include/sfml)
+#include_directories(/usr/include/freetype2)
 
-link_directories(../vb01/build)
-link_directories(../vb01Gui/build)
-link_directories(/usr/lib)
+#link_directories(/usr/lib)
 
 set(states abstractAppState.cpp activeGameState.cpp inGameAppState.cpp guiAppState.cpp)
 set(util util.cpp)
@@ -25,9 +18,39 @@ set(aircraft jet.cpp demoJet.cpp missileJet.cpp)
 set(fx explosion.cpp)
 set(content player.cpp unit.cpp map.cpp ${ships} ${projectiles} ${aircraft} ${fx})
 
-add_executable(battleship ${states} ${gui} ${core} ${content} ${util})
-target_link_libraries(battleship vb01d)
-target_link_libraries(battleship vb01Gui)
-target_link_libraries(battleship sfml-system)
-target_link_libraries(battleship sfml-audio)
-target_link_libraries(battleship glfw)
+set(GLFW_DIR external/glfw)
+set(FREETYPE_DIR external/vb01Gui/external/vb01/external/freetype)
+set(SFML_DIR external/SFML)
+set(VB01_DIR external/vb01Gui/external/vb01)
+set(VB01_GUI_DIR external/vb01Gui)
+set(GAME_NAME battleship)
+
+add_executable(${GAME_NAME} ${states} ${gui} ${core} ${content} ${util})
+
+target_include_directories(${GAME_NAME} PUBLIC ${FREETYPE_DIR}/include)
+
+#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})
+
+add_subdirectory(${VB01_GUI_DIR})
+set(VB01_GUI_LIB_DIR build/${VB01_GUI_DIR})
+target_include_directories(${GAME_NAME} PUBLIC ${VB01_GUI_DIR})
+target_link_directories(${GAME_NAME} PUBLIC ${VB01_GUI_LIB_DIR})
+
+add_subdirectory(${GLFW_DIR})
+set(GLFW_LIB_DIR build/${GLFW_DIR}/src)
+target_include_directories(${GAME_NAME} PUBLIC ${GLFW_DIR}/include/GLFW)
+target_link_directories(${GAME_NAME} PUBLIC ${GLFW_LIB_DIR})
+
+add_subdirectory(${SFML_DIR})
+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})
+
+target_link_libraries(${GAME_NAME} vb01)
+target_link_libraries(${GAME_NAME} vb01Gui)
+target_link_libraries(${GAME_NAME} sfml-system)
+target_link_libraries(${GAME_NAME} sfml-audio)
+target_link_libraries(${GAME_NAME} glfw3)