diff options
-rw-r--r-- | CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/irc/irc_client.cpp (renamed from src/libirc/irc_client.cpp) | 4 | ||||
-rw-r--r-- | src/irc/irc_client.hpp (renamed from src/libirc/irc_client.hpp) | 2 | ||||
-rw-r--r-- | src/irc/irc_message.cpp (renamed from src/libirc/irc_message.cpp) | 2 | ||||
-rw-r--r-- | src/irc/irc_message.hpp (renamed from src/libirc/irc_message.hpp) | 0 | ||||
-rw-r--r-- | src/main.cpp | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 163e361..9f1eef6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,20 +20,20 @@ add_library(network STATIC ${source_network}) # ## irclib # -file(GLOB source_libirc - src/libirc/*.[hc]pp) -add_library(libirc STATIC ${source_libirc}) -target_link_libraries(libirc network) +file(GLOB source_irc + src/irc/*.[hc]pp) +add_library(irc STATIC ${source_irc}) +target_link_libraries(irc network ${CRYPTO++_LIBRARIES}) # ## xmpplib # -file(GLOB source_libxmpp - src/libxmpp/*.[hc]pp) -add_library(libxmpp STATIC ${source_libxmpp}) -target_link_libraries(libxmpp network) +file(GLOB source_xmpp + src/xmpp/*.[hc]pp) +add_library(xmpp STATIC ${source_xmpp}) +target_link_libraries(xmpp network ) add_executable(${PROJECT_NAME} src/main.cpp) target_link_libraries(${PROJECT_NAME} - libxmpp - libirc)
\ No newline at end of file + xmpp + irc)
\ No newline at end of file diff --git a/src/libirc/irc_client.cpp b/src/irc/irc_client.cpp index a427026..83d1b0d 100644 --- a/src/libirc/irc_client.cpp +++ b/src/irc/irc_client.cpp @@ -1,5 +1,5 @@ -#include <libirc/irc_client.hpp> -#include <libirc/irc_message.hpp> +#include <irc/irc_client.hpp> +#include <irc/irc_message.hpp> #include <iostream> #include <stdexcept> diff --git a/src/libirc/irc_client.hpp b/src/irc/irc_client.hpp index 9778876..e380f5b 100644 --- a/src/libirc/irc_client.hpp +++ b/src/irc/irc_client.hpp @@ -1,7 +1,7 @@ #ifndef IRC_CLIENT_INCLUDED # define IRC_CLIENT_INCLUDED -#include <libirc/irc_message.hpp> +#include <irc/irc_message.hpp> #include <network/socket_handler.hpp> diff --git a/src/libirc/irc_message.cpp b/src/irc/irc_message.cpp index fc691b4..18fa3ec 100644 --- a/src/libirc/irc_message.cpp +++ b/src/irc/irc_message.cpp @@ -1,4 +1,4 @@ -#include <libirc/irc_message.hpp> +#include <irc/irc_message.hpp> #include <iostream> IrcMessage::IrcMessage(std::string&& line) diff --git a/src/libirc/irc_message.hpp b/src/irc/irc_message.hpp index a0bd772..a0bd772 100644 --- a/src/libirc/irc_message.hpp +++ b/src/irc/irc_message.hpp diff --git a/src/main.cpp b/src/main.cpp index aeeda34..fe3b2e5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -#include <libirc/irc_client.hpp> +#include <irc/irc_client.hpp> #include <network/poller.hpp> int main() |