diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dfbea8..98b2511 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,15 +15,17 @@ include(build/CMakeLists.txt) # Setup source files add_subdirectory(src) -# Add PackagedBuild target to package a release build -add_custom_target(PackagedBuild) -add_dependencies(PackagedBuild jupiter Bot) +# Add PackagedBuild target to package a release build, and FullBotBuild to just build all plugins +add_custom_target(FullBotBuild) +add_dependencies(FullBotBuild jupiter Bot) if(NOT DEFINED PACKAGED_BUILD_PATH) set(PACKAGED_BUILD_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin") endif() message(STATUS "PackagedBuild Path: ${PACKAGED_BUILD_PATH}") +add_custom_target(PackagedBuild) +add_dependencies(PackagedBuild FullBotBuild) add_custom_command(TARGET PackagedBuild PRE_BUILD COMMAND ${CMAKE_COMMAND} -E rm -rf ${PACKAGED_BUILD_PATH}) @@ -38,7 +40,7 @@ add_custom_command(TARGET PackagedBuild COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/baseline ${PACKAGED_BUILD_PATH}/) foreach(plugin ${JUPITER_PLUGINS}) - add_dependencies(PackagedBuild ${plugin}) + add_dependencies(FullBotBuild ${plugin}) add_custom_command(TARGET PackagedBuild POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${PACKAGED_BUILD_PATH}/Plugins/) diff --git a/src/Jupiter b/src/Jupiter index 3a11bda..b010fea 160000 --- a/src/Jupiter +++ b/src/Jupiter @@ -1 +1 @@ -Subproject commit 3a11bda36d30ce285604928ece72418af7fb921d +Subproject commit b010fea3929add75cf3ee63c10828d3b0526643d diff --git a/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp index e65e419..ed1c28e 100644 --- a/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp +++ b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp @@ -19,7 +19,7 @@ #include #include #include "Jupiter/Functions.h" -#include "duration.hpp" +#include "jessilib/duration.hpp" #include "IRC_Bot.h" #include "RenX_Commands.h" #include "RenX_Core.h" diff --git a/src/jessilib b/src/jessilib index 59d04d7..f00e36b 160000 --- a/src/jessilib +++ b/src/jessilib @@ -1 +1 @@ -Subproject commit 59d04d737ac4445ba96c9c117dcf8d95654719a3 +Subproject commit f00e36bce2f5ee1d418e23e7749dbcf4f9d61ce9