Add str_format as submodule

karnkaul · karnkaul · commit b750c0b8a51e · 2021-05-27T17:53:09.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -368,4 +368,9 @@ venv/
 
 # project-specific files and directories
 assets/
-manifest.json
+manifest.json
+
+# VSCode, clangd etc
+.vscode/
+.cache/
+compile_commands.json
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "libs/djson"]
 	path = libs/djson
 	url = https://github.com/karnkaul/djson
+[submodule "libs/include/str_format"]
+	path = libs/include/str_format
+	url = https://github.com/karnkaul/str-format
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,6 +32,7 @@ file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.*
 add_subdirectory(libs/djson)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
+target_include_directories(${PROJECT_NAME} PRIVATE libs/include)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID STREQUAL GNU)
 	target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/libs/include/str_format b/libs/include/str_format
@@ -0,0 +1 @@
+Subproject commit 123b3a8d5d956c1291282aec8e5dc8d102d94f9b
diff --git a/src/anim.cpp b/src/anim.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include "models.hpp"
 #include "utils.hpp"
-#include "str_format.hpp"
+#include <str_format/str_format.hpp>
 
 std::vector<std::string> gen_healthbar(Pokemon& pkmn)
 {
diff --git a/src/models.cpp b/src/models.cpp
@@ -3,7 +3,7 @@
 #include <numeric>
 #include <vector>
 #include "utils.hpp"
-#include "str_format.hpp"
+#include <str_format/str_format.hpp>
 #include <dumb_json/djson.hpp>
 
 Move::Move(std::string name, MoveType type, int accuracy, int effect_chance, int power, std::string flavor_text)
diff --git a/src/str_format.hpp b/src/str_format.hpp
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <thread>
 #include "utils.hpp"
-#include "str_format.hpp"
+#include <str_format/str_format.hpp>
 #include <dumb_json/djson.hpp>
 
 void clear_screen()

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <vector>`
`6`	`6`	`#include "models.hpp"`
`7`	`7`	`#include "utils.hpp"`
`8`		`-#include "str_format.hpp"`
	`8`	`+#include <str_format/str_format.hpp>`
`9`	`9`
`10`	`10`	`std::vector<std::string> gen_healthbar(Pokemon& pkmn)`
`11`	`11`	`{`