diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 16 | ||||
m--------- | vendor/mastodonpp | 0 | ||||
-rw-r--r-- | yandere.cpp | 4 |
4 files changed, 14 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 5888bee..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules | |||
@@ -1,3 +0,0 @@ | |||
1 | [submodule "vendor/mastodonpp"] | ||
2 | path = vendor/mastodonpp | ||
3 | url = https://schlomp.space/tastytea/mastodonpp.git | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt index c77e9fa..944d769 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -1,11 +1,19 @@ | |||
1 | cmake_minimum_required (VERSION 3.1) | 1 | cmake_minimum_required (VERSION 3.1) |
2 | project (yandere) | 2 | project (yandere) |
3 | 3 | ||
4 | add_subdirectory(vendor/mastodonpp) | 4 | find_package(PkgConfig) |
5 | add_subdirectory(vendor/yaml-cpp EXCLUDE_FROM_ALL) | 5 | pkg_check_modules(yaml-cpp yaml-cpp REQUIRED) |
6 | pkg_check_modules(mastodonpp mastodonpp REQUIRED) | ||
7 | |||
8 | include_directories( | ||
9 | ${mastodonpp_INCLUDE_DIRS} | ||
10 | ${yaml-cpp_INCLUDE_DIRS}) | ||
11 | |||
12 | link_directories( | ||
13 | ${mastodonpp_LIBRARY_DIRS} | ||
14 | ${yaml-cpp_LIBRARY_DIRS}) | ||
6 | 15 | ||
7 | include_directories(vendor/mastodonpp/include vendor/yaml-cpp/include) | ||
8 | add_executable(yandere yandere.cpp) | 16 | add_executable(yandere yandere.cpp) |
9 | set_property(TARGET yandere PROPERTY CXX_STANDARD 17) | 17 | set_property(TARGET yandere PROPERTY CXX_STANDARD 17) |
10 | set_property(TARGET yandere PROPERTY CXX_STANDARD_REQUIRED ON) | 18 | set_property(TARGET yandere PROPERTY CXX_STANDARD_REQUIRED ON) |
11 | target_link_libraries(yandere yaml-cpp mastodonpp) | 19 | target_link_libraries(yandere ${mastodonpp_LIBRARIES} ${yaml-cpp_LIBRARIES}) |
diff --git a/vendor/mastodonpp b/vendor/mastodonpp deleted file mode 160000 | |||
Subproject c48f1dc3d0566cef2baf96df7b3a7c55490a3e9 | |||
diff --git a/yandere.cpp b/yandere.cpp index 31746e1..1db126b 100644 --- a/yandere.cpp +++ b/yandere.cpp | |||
@@ -3,7 +3,7 @@ | |||
3 | #include <random> | 3 | #include <random> |
4 | #include <sstream> | 4 | #include <sstream> |
5 | #include <fstream> | 5 | #include <fstream> |
6 | #include <mastodonpp.hpp> | 6 | #include <mastodonpp/mastodonpp.hpp> |
7 | #include <chrono> | 7 | #include <chrono> |
8 | #include <thread> | 8 | #include <thread> |
9 | #include <algorithm> | 9 | #include <algorithm> |
@@ -203,7 +203,7 @@ void run(const std::string& configfile) | |||
203 | std::cout << action << std::endl; | 203 | std::cout << action << std::endl; |
204 | std::cout << "Waiting" << std::endl; | 204 | std::cout << "Waiting" << std::endl; |
205 | 205 | ||
206 | std::this_thread::sleep_for(std::chrono::hours(1)); | 206 | std::this_thread::sleep_for(std::chrono::hours(2)); |
207 | 207 | ||
208 | std::cout << std::endl; | 208 | std::cout << std::endl; |
209 | } | 209 | } |