diff --git a/source/shared_lib/sources/libircclient/Changelog b/external/libircclient/Changelog similarity index 100% rename from source/shared_lib/sources/libircclient/Changelog rename to external/libircclient/Changelog diff --git a/source/shared_lib/sources/libircclient/Doxyfile b/external/libircclient/Doxyfile similarity index 100% rename from source/shared_lib/sources/libircclient/Doxyfile rename to external/libircclient/Doxyfile diff --git a/source/shared_lib/sources/libircclient/LICENSE b/external/libircclient/LICENSE similarity index 100% rename from source/shared_lib/sources/libircclient/LICENSE rename to external/libircclient/LICENSE diff --git a/source/shared_lib/sources/libircclient/Makefile b/external/libircclient/Makefile similarity index 100% rename from source/shared_lib/sources/libircclient/Makefile rename to external/libircclient/Makefile diff --git a/source/shared_lib/sources/libircclient/README b/external/libircclient/README similarity index 100% rename from source/shared_lib/sources/libircclient/README rename to external/libircclient/README diff --git a/source/shared_lib/sources/libircclient/THANKS b/external/libircclient/THANKS similarity index 100% rename from source/shared_lib/sources/libircclient/THANKS rename to external/libircclient/THANKS diff --git a/source/shared_lib/sources/libircclient/build-release.sh b/external/libircclient/build-release.sh similarity index 100% rename from source/shared_lib/sources/libircclient/build-release.sh rename to external/libircclient/build-release.sh diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/DDInvocationGrabber.h b/external/libircclient/cocoa/Classes/DDInvocationGrabber.h similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/DDInvocationGrabber.h rename to external/libircclient/cocoa/Classes/DDInvocationGrabber.h diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/DDInvocationGrabber.m b/external/libircclient/cocoa/Classes/DDInvocationGrabber.m similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/DDInvocationGrabber.m rename to external/libircclient/cocoa/Classes/DDInvocationGrabber.m diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientChannel.h b/external/libircclient/cocoa/Classes/IRCClientChannel.h similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientChannel.h rename to external/libircclient/cocoa/Classes/IRCClientChannel.h diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientChannel.m b/external/libircclient/cocoa/Classes/IRCClientChannel.m similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientChannel.m rename to external/libircclient/cocoa/Classes/IRCClientChannel.m diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientChannelDelegate.h b/external/libircclient/cocoa/Classes/IRCClientChannelDelegate.h similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientChannelDelegate.h rename to external/libircclient/cocoa/Classes/IRCClientChannelDelegate.h diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientSession.h b/external/libircclient/cocoa/Classes/IRCClientSession.h similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientSession.h rename to external/libircclient/cocoa/Classes/IRCClientSession.h diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientSession.m b/external/libircclient/cocoa/Classes/IRCClientSession.m similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientSession.m rename to external/libircclient/cocoa/Classes/IRCClientSession.m diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientSessionDelegate.h b/external/libircclient/cocoa/Classes/IRCClientSessionDelegate.h similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/IRCClientSessionDelegate.h rename to external/libircclient/cocoa/Classes/IRCClientSessionDelegate.h diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/NSObject+DDExtensions.h b/external/libircclient/cocoa/Classes/NSObject+DDExtensions.h similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/NSObject+DDExtensions.h rename to external/libircclient/cocoa/Classes/NSObject+DDExtensions.h diff --git a/source/shared_lib/sources/libircclient/cocoa/Classes/NSObject+DDExtensions.m b/external/libircclient/cocoa/Classes/NSObject+DDExtensions.m similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Classes/NSObject+DDExtensions.m rename to external/libircclient/cocoa/Classes/NSObject+DDExtensions.m diff --git a/source/shared_lib/sources/libircclient/cocoa/Doxyfile b/external/libircclient/cocoa/Doxyfile similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Doxyfile rename to external/libircclient/cocoa/Doxyfile diff --git a/source/shared_lib/sources/libircclient/cocoa/English.lproj/InfoPlist.strings b/external/libircclient/cocoa/English.lproj/InfoPlist.strings similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/English.lproj/InfoPlist.strings rename to external/libircclient/cocoa/English.lproj/InfoPlist.strings diff --git a/source/shared_lib/sources/libircclient/cocoa/IRCClient.xcodeproj/TemplateIcon.icns b/external/libircclient/cocoa/IRCClient.xcodeproj/TemplateIcon.icns similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/IRCClient.xcodeproj/TemplateIcon.icns rename to external/libircclient/cocoa/IRCClient.xcodeproj/TemplateIcon.icns diff --git a/source/shared_lib/sources/libircclient/cocoa/IRCClient.xcodeproj/project.pbxproj b/external/libircclient/cocoa/IRCClient.xcodeproj/project.pbxproj similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/IRCClient.xcodeproj/project.pbxproj rename to external/libircclient/cocoa/IRCClient.xcodeproj/project.pbxproj diff --git a/source/shared_lib/sources/libircclient/cocoa/IRCClient_Prefix.pch b/external/libircclient/cocoa/IRCClient_Prefix.pch similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/IRCClient_Prefix.pch rename to external/libircclient/cocoa/IRCClient_Prefix.pch diff --git a/source/shared_lib/sources/libircclient/cocoa/Info.plist b/external/libircclient/cocoa/Info.plist similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/Info.plist rename to external/libircclient/cocoa/Info.plist diff --git a/source/shared_lib/sources/libircclient/cocoa/LICENSE b/external/libircclient/cocoa/LICENSE similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/LICENSE rename to external/libircclient/cocoa/LICENSE diff --git a/source/shared_lib/sources/libircclient/cocoa/README b/external/libircclient/cocoa/README similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/README rename to external/libircclient/cocoa/README diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_d_d_invocation_grabber_8h-source.html b/external/libircclient/cocoa/doc/html/_d_d_invocation_grabber_8h-source.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_d_d_invocation_grabber_8h-source.html rename to external/libircclient/cocoa/doc/html/_d_d_invocation_grabber_8h-source.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h-source.html b/external/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h-source.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h-source.html rename to external/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h-source.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h.html b/external/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h.html rename to external/libircclient/cocoa/doc/html/_i_r_c_client_channel_8h.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h-source.html b/external/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h-source.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h-source.html rename to external/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h-source.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h.html b/external/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h.html rename to external/libircclient/cocoa/doc/html/_i_r_c_client_channel_delegate_8h.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_session_8h-source.html b/external/libircclient/cocoa/doc/html/_i_r_c_client_session_8h-source.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_session_8h-source.html rename to external/libircclient/cocoa/doc/html/_i_r_c_client_session_8h-source.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_session_8h.html b/external/libircclient/cocoa/doc/html/_i_r_c_client_session_8h.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_session_8h.html rename to external/libircclient/cocoa/doc/html/_i_r_c_client_session_8h.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_session_delegate_8h-source.html b/external/libircclient/cocoa/doc/html/_i_r_c_client_session_delegate_8h-source.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_i_r_c_client_session_delegate_8h-source.html rename to external/libircclient/cocoa/doc/html/_i_r_c_client_session_delegate_8h-source.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/_n_s_object_09_d_d_extensions_8h-source.html b/external/libircclient/cocoa/doc/html/_n_s_object_09_d_d_extensions_8h-source.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/_n_s_object_09_d_d_extensions_8h-source.html rename to external/libircclient/cocoa/doc/html/_n_s_object_09_d_d_extensions_8h-source.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/annotated.html b/external/libircclient/cocoa/doc/html/annotated.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/annotated.html rename to external/libircclient/cocoa/doc/html/annotated.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/class_i_r_c_client_channel-members.html b/external/libircclient/cocoa/doc/html/class_i_r_c_client_channel-members.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/class_i_r_c_client_channel-members.html rename to external/libircclient/cocoa/doc/html/class_i_r_c_client_channel-members.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/class_i_r_c_client_session-members.html b/external/libircclient/cocoa/doc/html/class_i_r_c_client_session-members.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/class_i_r_c_client_session-members.html rename to external/libircclient/cocoa/doc/html/class_i_r_c_client_session-members.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_channel_delegate_08-members.html b/external/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_channel_delegate_08-members.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_channel_delegate_08-members.html rename to external/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_channel_delegate_08-members.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_session_delegate_08-members.html b/external/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_session_delegate_08-members.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_session_delegate_08-members.html rename to external/libircclient/cocoa/doc/html/class_n_s_object_07_i_r_c_client_session_delegate_08-members.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/classes.html b/external/libircclient/cocoa/doc/html/classes.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/classes.html rename to external/libircclient/cocoa/doc/html/classes.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/doxygen.css b/external/libircclient/cocoa/doc/html/doxygen.css similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/doxygen.css rename to external/libircclient/cocoa/doc/html/doxygen.css diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/doxygen.png b/external/libircclient/cocoa/doc/html/doxygen.png similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/doxygen.png rename to external/libircclient/cocoa/doc/html/doxygen.png diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/files.html b/external/libircclient/cocoa/doc/html/files.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/files.html rename to external/libircclient/cocoa/doc/html/files.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/functions.html b/external/libircclient/cocoa/doc/html/functions.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/functions.html rename to external/libircclient/cocoa/doc/html/functions.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/functions_func.html b/external/libircclient/cocoa/doc/html/functions_func.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/functions_func.html rename to external/libircclient/cocoa/doc/html/functions_func.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/functions_prop.html b/external/libircclient/cocoa/doc/html/functions_prop.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/functions_prop.html rename to external/libircclient/cocoa/doc/html/functions_prop.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/hierarchy.html b/external/libircclient/cocoa/doc/html/hierarchy.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/hierarchy.html rename to external/libircclient/cocoa/doc/html/hierarchy.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/index.html b/external/libircclient/cocoa/doc/html/index.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/index.html rename to external/libircclient/cocoa/doc/html/index.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.html b/external/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.html rename to external/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.png b/external/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.png similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.png rename to external/libircclient/cocoa/doc/html/interface_i_r_c_client_channel.png diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_session.html b/external/libircclient/cocoa/doc/html/interface_i_r_c_client_session.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_session.html rename to external/libircclient/cocoa/doc/html/interface_i_r_c_client_session.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_session.png b/external/libircclient/cocoa/doc/html/interface_i_r_c_client_session.png similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/interface_i_r_c_client_session.png rename to external/libircclient/cocoa/doc/html/interface_i_r_c_client_session.png diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_channel_delegate_08.html b/external/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_channel_delegate_08.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_channel_delegate_08.html rename to external/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_channel_delegate_08.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_session_delegate_08.html b/external/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_session_delegate_08.html similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_session_delegate_08.html rename to external/libircclient/cocoa/doc/html/interface_n_s_object_07_i_r_c_client_session_delegate_08.html diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/tab_b.gif b/external/libircclient/cocoa/doc/html/tab_b.gif similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/tab_b.gif rename to external/libircclient/cocoa/doc/html/tab_b.gif diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/tab_l.gif b/external/libircclient/cocoa/doc/html/tab_l.gif similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/tab_l.gif rename to external/libircclient/cocoa/doc/html/tab_l.gif diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/tab_r.gif b/external/libircclient/cocoa/doc/html/tab_r.gif similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/tab_r.gif rename to external/libircclient/cocoa/doc/html/tab_r.gif diff --git a/source/shared_lib/sources/libircclient/cocoa/doc/html/tabs.css b/external/libircclient/cocoa/doc/html/tabs.css similarity index 100% rename from source/shared_lib/sources/libircclient/cocoa/doc/html/tabs.css rename to external/libircclient/cocoa/doc/html/tabs.css diff --git a/source/shared_lib/sources/libircclient/configure b/external/libircclient/configure similarity index 100% rename from source/shared_lib/sources/libircclient/configure rename to external/libircclient/configure diff --git a/source/shared_lib/sources/libircclient/configure.in b/external/libircclient/configure.in similarity index 100% rename from source/shared_lib/sources/libircclient/configure.in rename to external/libircclient/configure.in diff --git a/source/shared_lib/sources/libircclient/doc/Makefile b/external/libircclient/doc/Makefile similarity index 100% rename from source/shared_lib/sources/libircclient/doc/Makefile rename to external/libircclient/doc/Makefile diff --git a/source/shared_lib/sources/libircclient/doc/conf.py b/external/libircclient/doc/conf.py similarity index 100% rename from source/shared_lib/sources/libircclient/doc/conf.py rename to external/libircclient/doc/conf.py diff --git a/source/shared_lib/sources/libircclient/doc/index.rst b/external/libircclient/doc/index.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/index.rst rename to external/libircclient/doc/index.rst diff --git a/source/shared_lib/sources/libircclient/doc/make.bat b/external/libircclient/doc/make.bat similarity index 100% rename from source/shared_lib/sources/libircclient/doc/make.bat rename to external/libircclient/doc/make.bat diff --git a/source/shared_lib/sources/libircclient/doc/sources/API_reference_callbacks.rst b/external/libircclient/doc/sources/API_reference_callbacks.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/API_reference_callbacks.rst rename to external/libircclient/doc/sources/API_reference_callbacks.rst diff --git a/source/shared_lib/sources/libircclient/doc/sources/API_reference_constants.rst b/external/libircclient/doc/sources/API_reference_constants.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/API_reference_constants.rst rename to external/libircclient/doc/sources/API_reference_constants.rst diff --git a/source/shared_lib/sources/libircclient/doc/sources/API_reference_functions.rst b/external/libircclient/doc/sources/API_reference_functions.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/API_reference_functions.rst rename to external/libircclient/doc/sources/API_reference_functions.rst diff --git a/source/shared_lib/sources/libircclient/doc/sources/API_reference_types.rst b/external/libircclient/doc/sources/API_reference_types.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/API_reference_types.rst rename to external/libircclient/doc/sources/API_reference_types.rst diff --git a/source/shared_lib/sources/libircclient/doc/sources/Appendix_FAQ.rst b/external/libircclient/doc/sources/Appendix_FAQ.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/Appendix_FAQ.rst rename to external/libircclient/doc/sources/Appendix_FAQ.rst diff --git a/source/shared_lib/sources/libircclient/doc/sources/Appendix_LGPL.rst b/external/libircclient/doc/sources/Appendix_LGPL.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/Appendix_LGPL.rst rename to external/libircclient/doc/sources/Appendix_LGPL.rst diff --git a/source/shared_lib/sources/libircclient/doc/sources/Introduction.rst b/external/libircclient/doc/sources/Introduction.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/Introduction.rst rename to external/libircclient/doc/sources/Introduction.rst diff --git a/source/shared_lib/sources/libircclient/doc/sources/Writing_code.rst b/external/libircclient/doc/sources/Writing_code.rst similarity index 100% rename from source/shared_lib/sources/libircclient/doc/sources/Writing_code.rst rename to external/libircclient/doc/sources/Writing_code.rst diff --git a/source/shared_lib/sources/libircclient/examples/Makefile.in b/external/libircclient/examples/Makefile.in similarity index 100% rename from source/shared_lib/sources/libircclient/examples/Makefile.in rename to external/libircclient/examples/Makefile.in diff --git a/source/shared_lib/sources/libircclient/examples/censor.cpp b/external/libircclient/examples/censor.cpp similarity index 100% rename from source/shared_lib/sources/libircclient/examples/censor.cpp rename to external/libircclient/examples/censor.cpp diff --git a/source/shared_lib/sources/libircclient/examples/colors.cpp b/external/libircclient/examples/colors.cpp similarity index 100% rename from source/shared_lib/sources/libircclient/examples/colors.cpp rename to external/libircclient/examples/colors.cpp diff --git a/source/shared_lib/sources/libircclient/examples/ircftp.cpp b/external/libircclient/examples/ircftp.cpp similarity index 100% rename from source/shared_lib/sources/libircclient/examples/ircftp.cpp rename to external/libircclient/examples/ircftp.cpp diff --git a/source/shared_lib/sources/libircclient/examples/irctest.c b/external/libircclient/examples/irctest.c similarity index 100% rename from source/shared_lib/sources/libircclient/examples/irctest.c rename to external/libircclient/examples/irctest.c diff --git a/source/shared_lib/sources/libircclient/examples/spammer.c b/external/libircclient/examples/spammer.c similarity index 100% rename from source/shared_lib/sources/libircclient/examples/spammer.c rename to external/libircclient/examples/spammer.c diff --git a/source/shared_lib/sources/libircclient/include/libirc_errors.h b/external/libircclient/include/libirc_errors.h similarity index 100% rename from source/shared_lib/sources/libircclient/include/libirc_errors.h rename to external/libircclient/include/libirc_errors.h diff --git a/source/shared_lib/sources/libircclient/include/libirc_events.h b/external/libircclient/include/libirc_events.h similarity index 100% rename from source/shared_lib/sources/libircclient/include/libirc_events.h rename to external/libircclient/include/libirc_events.h diff --git a/source/shared_lib/sources/libircclient/include/libirc_options.h b/external/libircclient/include/libirc_options.h similarity index 100% rename from source/shared_lib/sources/libircclient/include/libirc_options.h rename to external/libircclient/include/libirc_options.h diff --git a/source/shared_lib/sources/libircclient/include/libirc_rfcnumeric.h b/external/libircclient/include/libirc_rfcnumeric.h similarity index 100% rename from source/shared_lib/sources/libircclient/include/libirc_rfcnumeric.h rename to external/libircclient/include/libirc_rfcnumeric.h diff --git a/source/shared_lib/sources/libircclient/include/libircclient.h b/external/libircclient/include/libircclient.h similarity index 100% rename from source/shared_lib/sources/libircclient/include/libircclient.h rename to external/libircclient/include/libircclient.h diff --git a/source/shared_lib/sources/libircclient/man/libircclient.1 b/external/libircclient/man/libircclient.1 similarity index 100% rename from source/shared_lib/sources/libircclient/man/libircclient.1 rename to external/libircclient/man/libircclient.1 diff --git a/source/shared_lib/sources/libircclient/src/Makefile.in b/external/libircclient/src/Makefile.in similarity index 100% rename from source/shared_lib/sources/libircclient/src/Makefile.in rename to external/libircclient/src/Makefile.in diff --git a/source/shared_lib/sources/libircclient/src/colors.c b/external/libircclient/src/colors.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/colors.c rename to external/libircclient/src/colors.c diff --git a/source/shared_lib/sources/libircclient/src/config.h b/external/libircclient/src/config.h similarity index 100% rename from source/shared_lib/sources/libircclient/src/config.h rename to external/libircclient/src/config.h diff --git a/source/shared_lib/sources/libircclient/src/config.h.in b/external/libircclient/src/config.h.in similarity index 100% rename from source/shared_lib/sources/libircclient/src/config.h.in rename to external/libircclient/src/config.h.in diff --git a/source/shared_lib/sources/libircclient/src/dcc.c b/external/libircclient/src/dcc.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/dcc.c rename to external/libircclient/src/dcc.c diff --git a/source/shared_lib/sources/libircclient/src/dcc.h b/external/libircclient/src/dcc.h similarity index 100% rename from source/shared_lib/sources/libircclient/src/dcc.h rename to external/libircclient/src/dcc.h diff --git a/source/shared_lib/sources/libircclient/src/errors.c b/external/libircclient/src/errors.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/errors.c rename to external/libircclient/src/errors.c diff --git a/source/shared_lib/sources/libircclient/src/libircclient.c b/external/libircclient/src/libircclient.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/libircclient.c rename to external/libircclient/src/libircclient.c diff --git a/source/shared_lib/sources/libircclient/src/libircclient.def b/external/libircclient/src/libircclient.def similarity index 100% rename from source/shared_lib/sources/libircclient/src/libircclient.def rename to external/libircclient/src/libircclient.def diff --git a/source/shared_lib/sources/libircclient/src/params.h b/external/libircclient/src/params.h similarity index 100% rename from source/shared_lib/sources/libircclient/src/params.h rename to external/libircclient/src/params.h diff --git a/source/shared_lib/sources/libircclient/src/portable.c b/external/libircclient/src/portable.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/portable.c rename to external/libircclient/src/portable.c diff --git a/source/shared_lib/sources/libircclient/src/session.h b/external/libircclient/src/session.h similarity index 100% rename from source/shared_lib/sources/libircclient/src/session.h rename to external/libircclient/src/session.h diff --git a/source/shared_lib/sources/libircclient/src/sockets.c b/external/libircclient/src/sockets.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/sockets.c rename to external/libircclient/src/sockets.c diff --git a/source/shared_lib/sources/libircclient/src/ssl.c b/external/libircclient/src/ssl.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/ssl.c rename to external/libircclient/src/ssl.c diff --git a/source/shared_lib/sources/libircclient/src/utils.c b/external/libircclient/src/utils.c similarity index 100% rename from source/shared_lib/sources/libircclient/src/utils.c rename to external/libircclient/src/utils.c diff --git a/source/shared_lib/sources/libircclient/vs2015-32/.gitignore b/external/libircclient/vs2015-32/.gitignore similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-32/.gitignore rename to external/libircclient/vs2015-32/.gitignore diff --git a/source/shared_lib/sources/libircclient/vs2015-32/libircclient.sln b/external/libircclient/vs2015-32/libircclient.sln similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-32/libircclient.sln rename to external/libircclient/vs2015-32/libircclient.sln diff --git a/source/shared_lib/sources/libircclient/vs2015-32/libircclient.vcxproj b/external/libircclient/vs2015-32/libircclient.vcxproj similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-32/libircclient.vcxproj rename to external/libircclient/vs2015-32/libircclient.vcxproj diff --git a/source/shared_lib/sources/libircclient/vs2015-32/libircclient.vcxproj.filters b/external/libircclient/vs2015-32/libircclient.vcxproj.filters similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-32/libircclient.vcxproj.filters rename to external/libircclient/vs2015-32/libircclient.vcxproj.filters diff --git a/source/shared_lib/sources/libircclient/vs2015-64/.gitignore b/external/libircclient/vs2015-64/.gitignore similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-64/.gitignore rename to external/libircclient/vs2015-64/.gitignore diff --git a/source/shared_lib/sources/libircclient/vs2015-64/libircclient.sln b/external/libircclient/vs2015-64/libircclient.sln similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-64/libircclient.sln rename to external/libircclient/vs2015-64/libircclient.sln diff --git a/source/shared_lib/sources/libircclient/vs2015-64/libircclient.vcxproj b/external/libircclient/vs2015-64/libircclient.vcxproj similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-64/libircclient.vcxproj rename to external/libircclient/vs2015-64/libircclient.vcxproj diff --git a/source/shared_lib/sources/libircclient/vs2015-64/libircclient.vcxproj.filters b/external/libircclient/vs2015-64/libircclient.vcxproj.filters similarity index 100% rename from source/shared_lib/sources/libircclient/vs2015-64/libircclient.vcxproj.filters rename to external/libircclient/vs2015-64/libircclient.vcxproj.filters diff --git a/source/shared_lib/sources/libircclient/vs2017-32/.gitignore b/external/libircclient/vs2017-32/.gitignore similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-32/.gitignore rename to external/libircclient/vs2017-32/.gitignore diff --git a/source/shared_lib/sources/libircclient/vs2017-32/libircclient.sln b/external/libircclient/vs2017-32/libircclient.sln similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-32/libircclient.sln rename to external/libircclient/vs2017-32/libircclient.sln diff --git a/source/shared_lib/sources/libircclient/vs2017-32/libircclient.vcxproj b/external/libircclient/vs2017-32/libircclient.vcxproj similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-32/libircclient.vcxproj rename to external/libircclient/vs2017-32/libircclient.vcxproj diff --git a/source/shared_lib/sources/libircclient/vs2017-32/libircclient.vcxproj.filters b/external/libircclient/vs2017-32/libircclient.vcxproj.filters similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-32/libircclient.vcxproj.filters rename to external/libircclient/vs2017-32/libircclient.vcxproj.filters diff --git a/source/shared_lib/sources/libircclient/vs2017-64/.gitignore b/external/libircclient/vs2017-64/.gitignore similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-64/.gitignore rename to external/libircclient/vs2017-64/.gitignore diff --git a/source/shared_lib/sources/libircclient/vs2017-64/libircclient.sln b/external/libircclient/vs2017-64/libircclient.sln similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-64/libircclient.sln rename to external/libircclient/vs2017-64/libircclient.sln diff --git a/source/shared_lib/sources/libircclient/vs2017-64/libircclient.vcxproj b/external/libircclient/vs2017-64/libircclient.vcxproj similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-64/libircclient.vcxproj rename to external/libircclient/vs2017-64/libircclient.vcxproj diff --git a/source/shared_lib/sources/libircclient/vs2017-64/libircclient.vcxproj.filters b/external/libircclient/vs2017-64/libircclient.vcxproj.filters similarity index 100% rename from source/shared_lib/sources/libircclient/vs2017-64/libircclient.vcxproj.filters rename to external/libircclient/vs2017-64/libircclient.vcxproj.filters diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 2e91fea62..b1db40435 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -147,6 +147,28 @@ IF(BUILD_ZETAGLEST) ######################################################################################### # zetaglest game + SET(ZG_SOURCE_FILES "") + # libircclient + IF(FORCE_EMBEDDED_LIBS) + SET(FORCE_USE_EMBEDDED_Ircclient ON) + ELSE() + OPTION(FORCE_USE_EMBEDDED_Ircclient "Use embedded to source code version of ircclient" OFF) + ENDIF() + + IF(NOT FORCE_USE_EMBEDDED_Ircclient) + MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is: ${WANT_STATIC_LIBS} ...") + FIND_PACKAGE(Ircclient) + ENDIF() + + if(NOT IRCCLIENT_FOUND OR FORCE_USE_EMBEDDED_Ircclient) + message(STATUS "Using included libbircclient sources") + SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/external/libircclient/src/libircclient.c) + INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/external/libircclient/include) + else() + MESSAGE(STATUS "*** Using libircclient found in [${IRCCLIENT_INCLUDE_DIR}] IRCCLIENT_FOUND [${IRCCLIENT_FOUND}] IRCCLIENT_LIBRARY [${IRCCLIENT_LIBRARY}]") + INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) + SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) + endif() SET(DIRS_WITH_SRC ai @@ -204,8 +226,6 @@ IF(BUILD_ZETAGLEST) SET(GLEST_LIB_INCLUDE_DIRS ${GLEST_LIB_INCLUDE_DIRS} ${GLEST_LIB_INCLUDE_ROOT}platform/unix) ENDIF() - SET(ZG_SOURCE_FILES "") - FOREACH(DIR IN LISTS DIRS_WITH_SRC) INCLUDE_DIRECTORIES( ${DIR} ) diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/glest_game/menu/ircclient.cpp similarity index 100% rename from source/shared_lib/sources/platform/posix/ircclient.cpp rename to source/glest_game/menu/ircclient.cpp diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 00ff1638c..1a957206b 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -329,70 +329,8 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) INCLUDE_DIRECTORIES( ${ZG_INCLUDES_ROOT}xml/rapidxml ) INCLUDE_DIRECTORIES("sources/") - OPTION(WANT_USE_Ircclient "Enable libircclient support" ON) - IF(FORCE_EMBEDDED_LIBS) - SET(FORCE_USE_EMBEDDED_Ircclient ON) - ELSE() - OPTION(FORCE_USE_EMBEDDED_Ircclient "Use embedded to source code version of ircclient" OFF) - ENDIF() - - IF(WANT_USE_Ircclient) - #IF(NOT WANT_STATIC_LIBS) - IF(NOT FORCE_USE_EMBEDDED_Ircclient) - MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is: ${WANT_STATIC_LIBS} ...") - FIND_PACKAGE(Ircclient) - ENDIF() - - if(NOT IRCCLIENT_FOUND OR FORCE_USE_EMBEDDED_Ircclient) - if(NOT FORCE_USE_EMBEDDED_Ircclient) - MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]") - else() - MESSAGE(STATUS "*** Using EMBEDDED libircclient because it was forced by option") - endif() - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/libircclient/src/libircclient.c) - INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/sources/libircclient/include) - else() - MESSAGE(STATUS "*** Using libircclient found in [${IRCCLIENT_INCLUDE_DIR}] IRCCLIENT_FOUND [${IRCCLIENT_FOUND}] IRCCLIENT_LIBRARY [${IRCCLIENT_LIBRARY}]") - - INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) - SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) - endif() - - set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") - set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") - include(CheckCXXSourceRuns) - - check_cxx_source_runs(" - #include - #include - #include - int main() - { - unsigned int high = 0; - unsigned int low = 0; - irc_get_version(&high,&low); - if( (high == 1 && low >= 6) || (high > 1)) { - throw 1; - } - else { - return 0; - } - }" - LIBIRCCLIENT_VERSION_PRE_1_6) - # ^ This test doesn't work, some general problem with irc_get_version - - IF(LIBIRCCLIENT_VERSION_PRE_1_6) - message(STATUS "Found LIBIRCCLIENT_VERSION_PRE_1_6: ${LIBIRCCLIENT_VERSION_PRE_1_6}") - ADD_DEFINITIONS(-DLIBIRCCLIENT_PRE1_6) - ENDIF() - else() - message(STATUS "****MESSAGE Disabling libircclient!!") - ADD_DEFINITIONS(-DDISABLE_IRCCLIENT) - endif() - IF(WIN32) SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/socket.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/ircclient.cpp) SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/miniftpserver.cpp) SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/miniftpclient.cpp) SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/gl_wrap.cpp)