From ef9c886a3615e98a3bc92b56afd308dd7f7d2ba0 Mon Sep 17 00:00:00 2001
From: devZoGok <nenkokeko@yandex.com>
Date: Mon, 3 Jan 2022 15:14:33 +0200
Subject: [PATCH] vb01 is now a direct dependency of the game

---
 .gitmodules    |  3 +++
 CMakeLists.txt | 13 ++++++-------
 external/vb01  |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 160000 external/vb01

diff --git a/.gitmodules b/.gitmodules
index 3f4dd20..4088143 100644
--- a/.gitmodules
+++ b/.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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67ca0d7..d1a8764 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/external/vb01 b/external/vb01
new file mode 160000
index 0000000..a469915
--- /dev/null
+++ b/external/vb01
@@ -0,0 +1 @@
+Subproject commit a469915e059ce4ae5f36b7a9227d40913465e71f