diff --git a/.gitignore b/.gitignore
index 5dab4e4..0453265 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
[Dd]ebug/
[Rr]elease/
x64/
-build/
[Bb]in/
[Oo]bj/
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..7351702
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.8)
+project(jupiter)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include(build/CMakeLists.txt)
+
+# Setup source files
+add_subdirectory(src)
diff --git a/Jupiter.sln b/Jupiter.sln
deleted file mode 100644
index c857f75..0000000
--- a/Jupiter.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jupiter", "Jupiter\Jupiter.vcxproj", "{367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tester", "Tester\Tester.vcxproj", "{0F041791-1047-4C6A-A4C1-814E6957D5EB}"
- ProjectSection(ProjectDependencies) = postProject
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8} = {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|Win32.ActiveCfg = Debug|Win32
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|Win32.Build.0 = Debug|Win32
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|Win32.Deploy.0 = Debug|Win32
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|x64.ActiveCfg = Debug|x64
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Debug|x64.Build.0 = Debug|x64
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|Win32.ActiveCfg = Release|Win32
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|Win32.Build.0 = Release|Win32
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|x64.ActiveCfg = Release|x64
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}.Release|x64.Build.0 = Release|x64
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|Win32.ActiveCfg = Debug|Win32
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|Win32.Build.0 = Debug|Win32
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|x64.ActiveCfg = Debug|x64
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Debug|x64.Build.0 = Debug|x64
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|Win32.ActiveCfg = Release|Win32
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|Win32.Build.0 = Release|Win32
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|x64.ActiveCfg = Release|x64
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/Jupiter/Jupiter.vcxproj b/Jupiter/Jupiter.vcxproj
deleted file mode 100644
index 2cf0630..0000000
--- a/Jupiter/Jupiter.vcxproj
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {367CBCA8-6F27-484A-BC6C-2FC087FBB0C8}
- Win32Proj
- Jupiter
- 10.0.14393.0
-
-
-
- DynamicLibrary
- v141
- Unicode
-
-
- true
- false
-
-
- false
- true
-
-
-
-
-
-
-
-
-
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
- $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
-
-
- C:\dev\OpenSSL\Win32\include;$(IncludePath)
- C:\dev\OpenSSL\Win32\lib\VC;$(LibraryPath)
-
-
- C:\dev\OpenSSL\Win64\include;$(IncludePath)
- C:\dev\OpenSSL\Win64\lib\VC;$(LibraryPath)
-
-
-
- Level4
- WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;JUPITER_EXPORTS;JUPITER_PLATFORM="$(Platform)/";%(PreprocessorDefinitions)
- Speed
- 4505
-
-
- Console
-
-
- %(AdditionalIncludeDirectories)
-
-
-
-
- libcrypto32MD.lib;libssl32MD.lib;%(AdditionalDependencies)
-
-
-
-
- libcrypto64MD.lib;libssl64MD.lib;%(AdditionalDependencies)
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
-
-
- Full
- true
-
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Jupiter/Jupiter.vcxproj.filters b/Jupiter/Jupiter.vcxproj.filters
deleted file mode 100644
index d43d9f9..0000000
--- a/Jupiter/Jupiter.vcxproj.filters
+++ /dev/null
@@ -1,261 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
- {1e778301-e8e9-4565-b651-8686ec19b419}
-
-
- {02e48221-98b3-4875-aa96-796a9aedc4b5}
-
-
- {a7ca0e66-d9b7-43e2-a3f8-d89744bd3c06}
-
-
- {6f290a91-7cd8-495e-ae20-22c956fcfbcb}
-
-
- {95b491ba-ca51-4aad-bdb8-7fae054498d2}
-
-
- {55c2d716-1fc1-42a3-8dc0-ef730ae338e4}
-
-
- {bd64544d-de91-47a1-afda-21e37a7e31e0}
-
-
- {10026b7d-c0ef-416c-ac1f-9e94064a404f}
-
-
- {08dcc387-4b58-4f1f-b785-9565fe67f645}
-
-
- {37b5eaf6-0e4f-4609-8518-1b72f93aebe5}
-
-
- {aef2e303-8a68-4cf9-8464-c4aef776d3f3}
-
-
- {790badaf-80b5-40b0-8de1-a71f4c523074}
-
-
- {7a4d818a-481e-467c-a3e3-d6d0e7dde244}
-
-
- {7db21243-8b23-4dd2-9888-0bdd3c5a1edd}
-
-
- {da033f3a-f5fd-4592-900f-f17bb3520547}
-
-
- {b5b148d5-c636-41eb-838a-7555114e1589}
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files\Sockets
-
-
- Source Files\Sockets
-
-
- Source Files\Sockets
-
-
- Source Files\Sockets
-
-
- Source Files\Files
-
-
- Source Files
-
-
- Source Files\Object Extensions
-
-
- Source Files\Object Extensions
-
-
- Source Files
-
-
- Source Files\IRC
-
-
- Source Files
-
-
- Source Files\Files
-
-
- Source Files\HTTP
-
-
- Source Files\Object Extensions
-
-
- Source Files\Object Extensions
-
-
- Source Files
-
-
- Source Files\Files\Configs
-
-
- Source Files\Files\Configs
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files\Sockets
-
-
- Header Files\Sockets
-
-
- Header Files\Sockets
-
-
- Header Files\Sockets
-
-
- Header Files\IRC
-
-
- Header Files\IRC
-
-
- Header Files\Lists
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files\Object Extensions
-
-
- Header Files\Object Extensions
-
-
- Header Files\Object Extensions
-
-
- Header Files\IRC
-
-
- Header Files
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Strings
-
-
- Header Files\Files
-
-
- Header Files\DataBuffer
-
-
- Header Files\DataBuffer
-
-
- Header Files\HTTP
-
-
- Header Files\HTTP
-
-
- Header Files\HTTP
-
-
- Header Files\Object Extensions
-
-
- Header Files\Object Extensions
-
-
- Header Files\Hash
-
-
- Header Files\Hash
-
-
- Header Files\Hash
-
-
- Header Files\Files\Configs
-
-
- Header Files\Files\Configs
-
-
- Header Files
-
-
-
\ No newline at end of file
diff --git a/Jupiter/resource.h b/Jupiter/resource.h
deleted file mode 100644
index 7608838..0000000
--- a/Jupiter/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by Jupiter.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/Tester/Test.cpp b/Tester/Test.cpp
deleted file mode 100644
index 2bb6648..0000000
--- a/Tester/Test.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include
-#include
-#include
-#include
-#include "Jupiter/Functions.h"
-#include "Jupiter/CString.h"
-#include "Jupiter/String.h"
-#include "Jupiter/File.h"
-#include "Jupiter/Base64.h"
-#include "Jupiter/InvalidIndex.h"
-#include "Jupiter/Reference_String.h"
-#include "Jupiter/DataBuffer.h"
-#include "Jupiter/HTTP.h"
-#include "Jupiter/HTTP_Server.h"
-#include "Jupiter/HTTP_QueryString.h"
-#include "Jupiter/Hash.h"
-#include "Jupiter/Hash_Table.h"
-#include "Jupiter/Algorithm.h"
-
-using namespace Jupiter;
-using namespace Jupiter::literals;
-
-unsigned int good_tests = 0;
-unsigned int total_tests = 0;
-
-void test(bool expr)
-{
- ++total_tests;
- if (expr)
- ++good_tests;
- else
- std::cout << "Test number " << total_tests << " failed!" << std::endl;
-}
-
-template void test(T result, T expected_result)
-{
- ++total_tests;
-
- if (result == expected_result)
- ++good_tests;
- else
- {
- std::cout << "Test number " << total_tests << " failed!" << std::endl;
- std::cout << "\tExpected '" << expected_result << "' but got '" << result << "' instead" << std::endl;
- }
-}
-
-int main()
-{
- if (good_tests == total_tests)
- std::cout << "All " << total_tests << " tests succeeded." << std::endl;
- else
- std::cout << "ERROR: Only " << good_tests << "/" << total_tests << " tests succeeded. " << total_tests - good_tests << " tests failed." << std::endl;
-
- std::cout << "Press any key to continue..." << std::endl;
- std::cin.get();
-
- return 0;
-}
diff --git a/Tester/Tester.vcxproj b/Tester/Tester.vcxproj
deleted file mode 100644
index a88d435..0000000
--- a/Tester/Tester.vcxproj
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {0F041791-1047-4C6A-A4C1-814E6957D5EB}
- Win32Proj
- Tester
- 10.0.14393.0
-
-
-
- Application
- v141
- Unicode
-
-
- true
- false
-
-
- false
- true
-
-
-
-
-
-
-
-
-
- $(SolutionDir)bin\$(Platform)\$(Configuration)\;$(LibraryPath)
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
- $(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\
-
-
-
- Level4
- WIN32;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
- ../;%(AdditionalIncludeDirectories)
- Speed
-
-
- Console
- Jupiter.lib;%(AdditionalDependencies)
-
-
-
-
- Level3
- Disabled
- _DEBUG;%(PreprocessorDefinitions)
-
-
- true
-
-
-
-
- Level3
- Full
- NDEBUG;%(PreprocessorDefinitions)
-
-
- true
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Tester/Tester.vcxproj.filters b/Tester/Tester.vcxproj.filters
deleted file mode 100644
index 9691d4a..0000000
--- a/Tester/Tester.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hh;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
-
-
- Source Files
-
-
-
\ No newline at end of file
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
new file mode 100644
index 0000000..a840d28
--- /dev/null
+++ b/build/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Include any compiler-specifc settings
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_CXX_COMPILER_ID}")
+ include("${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_CXX_COMPILER_ID}/CMakeLists.txt")
+else()
+ message(STATUS "No compiler-specific settings set; CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
+endif()
diff --git a/build/MSVC/CMakeLists.txt b/build/MSVC/CMakeLists.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..a370822
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.8)
+
+# Setup source files
+add_subdirectory(common)
diff --git a/Jupiter/Base64.cpp b/src/common/Base64.cpp
similarity index 100%
rename from Jupiter/Base64.cpp
rename to src/common/Base64.cpp
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
new file mode 100644
index 0000000..c12cc88
--- /dev/null
+++ b/src/common/CMakeLists.txt
@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.8)
+
+# Setup source files
+set(SOURCE_FILES
+ Base64.cpp
+ Command.cpp
+ Config.cpp
+ Database.cpp
+ DataBuffer.cpp
+ File.cpp
+ Functions.c
+ GenericCommand.cpp
+ Hash.cpp
+ HTTP_Server.cpp
+ INIConfig.cpp
+ IRC_Client.cpp
+ Jupiter.cpp
+ Plugin.cpp
+ Rehash.cpp
+ SecureSocket.cpp
+ Socket.cpp
+ TCPSocket.cpp
+ Timer.cpp
+ UDPSocket.cpp)
+
+# Setup library build target
+add_library(jupiter SHARED ${SOURCE_FILES})
+
+# Find OpenSSL
+find_package(OpenSSL REQUIRED)
+
+# Setup include directories
+target_include_directories(jupiter PUBLIC ../include)
+target_include_directories(jupiter PRIVATE ${OPENSSL_INCLUDE_DIR})
+
+# Setup additionally needed libs
+target_link_libraries(jupiter ${OPENSSL_LIBRARIES})
+
+# Setup macros JUPITER_EXPORTS
+target_compile_definitions(jupiter PRIVATE JUPITER_EXPORTS)
diff --git a/Jupiter/Command.cpp b/src/common/Command.cpp
similarity index 98%
rename from Jupiter/Command.cpp
rename to src/common/Command.cpp
index b09ec3c..acb63d6 100644
--- a/Jupiter/Command.cpp
+++ b/src/common/Command.cpp
@@ -20,7 +20,7 @@
#include "ArrayList.h"
#include "Functions.h"
#include "Command.h"
-#include "String.h"
+#include "String.hpp"
struct Jupiter::Command::Data
{
diff --git a/Jupiter/Config.cpp b/src/common/Config.cpp
similarity index 100%
rename from Jupiter/Config.cpp
rename to src/common/Config.cpp
diff --git a/Jupiter/DataBuffer.cpp b/src/common/DataBuffer.cpp
similarity index 100%
rename from Jupiter/DataBuffer.cpp
rename to src/common/DataBuffer.cpp
diff --git a/Jupiter/Database.cpp b/src/common/Database.cpp
similarity index 100%
rename from Jupiter/Database.cpp
rename to src/common/Database.cpp
diff --git a/Jupiter/File.cpp b/src/common/File.cpp
similarity index 99%
rename from Jupiter/File.cpp
rename to src/common/File.cpp
index f457d81..3e7ef63 100644
--- a/Jupiter/File.cpp
+++ b/src/common/File.cpp
@@ -19,7 +19,7 @@
#include
#include "File.h"
#include "CString.h"
-#include "String.h"
+#include "String.hpp"
#include "Reference_String.h"
#include "ArrayList.h"
diff --git a/Jupiter/Functions.c b/src/common/Functions.c
similarity index 100%
rename from Jupiter/Functions.c
rename to src/common/Functions.c
diff --git a/Jupiter/GenericCommand.cpp b/src/common/GenericCommand.cpp
similarity index 100%
rename from Jupiter/GenericCommand.cpp
rename to src/common/GenericCommand.cpp
diff --git a/Jupiter/HTTP_Server.cpp b/src/common/HTTP_Server.cpp
similarity index 99%
rename from Jupiter/HTTP_Server.cpp
rename to src/common/HTTP_Server.cpp
index af19075..6a0b41c 100644
--- a/Jupiter/HTTP_Server.cpp
+++ b/src/common/HTTP_Server.cpp
@@ -18,7 +18,7 @@
#include
#include
-#include "String.h"
+#include "String.hpp"
#include "CString.h"
#include "Reference_String.h"
#include "TCPSocket.h"
diff --git a/Jupiter/Hash.cpp b/src/common/Hash.cpp
similarity index 100%
rename from Jupiter/Hash.cpp
rename to src/common/Hash.cpp
diff --git a/Jupiter/INIConfig.cpp b/src/common/INIConfig.cpp
similarity index 100%
rename from Jupiter/INIConfig.cpp
rename to src/common/INIConfig.cpp
diff --git a/Jupiter/IRC_Client.cpp b/src/common/IRC_Client.cpp
similarity index 99%
rename from Jupiter/IRC_Client.cpp
rename to src/common/IRC_Client.cpp
index c6e218b..97ecde8 100644
--- a/Jupiter/IRC_Client.cpp
+++ b/src/common/IRC_Client.cpp
@@ -24,7 +24,7 @@
#include "IRC_Client.h"
#include "TCPSocket.h"
#include "CString.h"
-#include "String.h"
+#include "String.hpp"
#include "Plugin.h"
#include "Base64.h"
diff --git a/Jupiter/Jupiter.cpp b/src/common/Jupiter.cpp
similarity index 100%
rename from Jupiter/Jupiter.cpp
rename to src/common/Jupiter.cpp
diff --git a/Jupiter/Plugin.cpp b/src/common/Plugin.cpp
similarity index 99%
rename from Jupiter/Plugin.cpp
rename to src/common/Plugin.cpp
index a37541a..765635b 100644
--- a/Jupiter/Plugin.cpp
+++ b/src/common/Plugin.cpp
@@ -29,7 +29,7 @@
#include "Functions.h"
#include "ArrayList.h"
#include "CString.h"
-#include "String.h"
+#include "String.hpp"
using namespace Jupiter::literals;
diff --git a/Jupiter/Rehash.cpp b/src/common/Rehash.cpp
similarity index 100%
rename from Jupiter/Rehash.cpp
rename to src/common/Rehash.cpp
diff --git a/Jupiter/SecureSocket.cpp b/src/common/SecureSocket.cpp
similarity index 100%
rename from Jupiter/SecureSocket.cpp
rename to src/common/SecureSocket.cpp
diff --git a/Jupiter/Socket.cpp b/src/common/Socket.cpp
similarity index 100%
rename from Jupiter/Socket.cpp
rename to src/common/Socket.cpp
diff --git a/Jupiter/TCPSocket.cpp b/src/common/TCPSocket.cpp
similarity index 100%
rename from Jupiter/TCPSocket.cpp
rename to src/common/TCPSocket.cpp
diff --git a/Jupiter/Timer.cpp b/src/common/Timer.cpp
similarity index 100%
rename from Jupiter/Timer.cpp
rename to src/common/Timer.cpp
diff --git a/Jupiter/UDPSocket.cpp b/src/common/UDPSocket.cpp
similarity index 100%
rename from Jupiter/UDPSocket.cpp
rename to src/common/UDPSocket.cpp
diff --git a/Jupiter/Algorithm.h b/src/include/Algorithm.h
similarity index 100%
rename from Jupiter/Algorithm.h
rename to src/include/Algorithm.h
diff --git a/Jupiter/ArrayList.h b/src/include/ArrayList.h
similarity index 100%
rename from Jupiter/ArrayList.h
rename to src/include/ArrayList.h
diff --git a/Jupiter/Base64.h b/src/include/Base64.h
similarity index 99%
rename from Jupiter/Base64.h
rename to src/include/Base64.h
index eb5a8af..41da727 100644
--- a/Jupiter/Base64.h
+++ b/src/include/Base64.h
@@ -27,7 +27,7 @@
#include
#include
#include "Jupiter.h"
-#include "String.h"
+#include "String.hpp"
namespace Jupiter
{
diff --git a/Jupiter/CString.h b/src/include/CString.h
similarity index 100%
rename from Jupiter/CString.h
rename to src/include/CString.h
diff --git a/Jupiter/CString_Imp.h b/src/include/CString_Imp.h
similarity index 100%
rename from Jupiter/CString_Imp.h
rename to src/include/CString_Imp.h
diff --git a/Jupiter/Command.h b/src/include/Command.h
similarity index 100%
rename from Jupiter/Command.h
rename to src/include/Command.h
diff --git a/Jupiter/Config.h b/src/include/Config.h
similarity index 100%
rename from Jupiter/Config.h
rename to src/include/Config.h
diff --git a/Jupiter/DataBuffer.h b/src/include/DataBuffer.h
similarity index 100%
rename from Jupiter/DataBuffer.h
rename to src/include/DataBuffer.h
diff --git a/Jupiter/DataBuffer_Imp.h b/src/include/DataBuffer_Imp.h
similarity index 100%
rename from Jupiter/DataBuffer_Imp.h
rename to src/include/DataBuffer_Imp.h
diff --git a/Jupiter/Database.h b/src/include/Database.h
similarity index 100%
rename from Jupiter/Database.h
rename to src/include/Database.h
diff --git a/Jupiter/File.h b/src/include/File.h
similarity index 100%
rename from Jupiter/File.h
rename to src/include/File.h
diff --git a/Jupiter/Functions.h b/src/include/Functions.h
similarity index 100%
rename from Jupiter/Functions.h
rename to src/include/Functions.h
diff --git a/Jupiter/GenericCommand.h b/src/include/GenericCommand.h
similarity index 99%
rename from Jupiter/GenericCommand.h
rename to src/include/GenericCommand.h
index 321b16d..8fef4a1 100644
--- a/Jupiter/GenericCommand.h
+++ b/src/include/GenericCommand.h
@@ -25,7 +25,7 @@
*/
#include "Command.h"
-#include "String.h"
+#include "String.hpp"
#include "ArrayList.h"
/** DLL Linkage Nagging */
diff --git a/Jupiter/HTTP.h b/src/include/HTTP.h
similarity index 100%
rename from Jupiter/HTTP.h
rename to src/include/HTTP.h
diff --git a/Jupiter/HTTP_QueryString.h b/src/include/HTTP_QueryString.h
similarity index 100%
rename from Jupiter/HTTP_QueryString.h
rename to src/include/HTTP_QueryString.h
diff --git a/Jupiter/HTTP_Server.h b/src/include/HTTP_Server.h
similarity index 100%
rename from Jupiter/HTTP_Server.h
rename to src/include/HTTP_Server.h
diff --git a/Jupiter/Hash.h b/src/include/Hash.h
similarity index 100%
rename from Jupiter/Hash.h
rename to src/include/Hash.h
diff --git a/Jupiter/Hash_Table.h b/src/include/Hash_Table.h
similarity index 99%
rename from Jupiter/Hash_Table.h
rename to src/include/Hash_Table.h
index 23126c4..dbef5e0 100644
--- a/Jupiter/Hash_Table.h
+++ b/src/include/Hash_Table.h
@@ -25,7 +25,7 @@
*/
#include
-#include "String.h"
+#include "String.hpp"
namespace Jupiter
{
diff --git a/Jupiter/Hash_Table_Imp.h b/src/include/Hash_Table_Imp.h
similarity index 100%
rename from Jupiter/Hash_Table_Imp.h
rename to src/include/Hash_Table_Imp.h
diff --git a/Jupiter/INIConfig.h b/src/include/INIConfig.h
similarity index 100%
rename from Jupiter/INIConfig.h
rename to src/include/INIConfig.h
diff --git a/Jupiter/IRC.h b/src/include/IRC.h
similarity index 100%
rename from Jupiter/IRC.h
rename to src/include/IRC.h
diff --git a/Jupiter/IRC_Client.h b/src/include/IRC_Client.h
similarity index 100%
rename from Jupiter/IRC_Client.h
rename to src/include/IRC_Client.h
diff --git a/Jupiter/IRC_Numerics.h b/src/include/IRC_Numerics.h
similarity index 100%
rename from Jupiter/IRC_Numerics.h
rename to src/include/IRC_Numerics.h
diff --git a/Jupiter/InvalidIndex.h b/src/include/InvalidIndex.h
similarity index 100%
rename from Jupiter/InvalidIndex.h
rename to src/include/InvalidIndex.h
diff --git a/Jupiter/Jupiter.h b/src/include/Jupiter.h
similarity index 100%
rename from Jupiter/Jupiter.h
rename to src/include/Jupiter.h
diff --git a/Jupiter/Plugin.h b/src/include/Plugin.h
similarity index 99%
rename from Jupiter/Plugin.h
rename to src/include/Plugin.h
index 297ebb0..0fd2b8f 100644
--- a/Jupiter/Plugin.h
+++ b/src/include/Plugin.h
@@ -28,7 +28,7 @@
#include "Thinker.h"
#include "Rehash.h"
#include "INIConfig.h"
-#include "String.h"
+#include "String.hpp"
/** DLL Linkage Nagging */
#if defined _MSC_VER
diff --git a/Jupiter/Readable_String.h b/src/include/Readable_String.h
similarity index 100%
rename from Jupiter/Readable_String.h
rename to src/include/Readable_String.h
diff --git a/Jupiter/Readable_String_Imp.h b/src/include/Readable_String_Imp.h
similarity index 100%
rename from Jupiter/Readable_String_Imp.h
rename to src/include/Readable_String_Imp.h
diff --git a/Jupiter/Reference_String.h b/src/include/Reference_String.h
similarity index 100%
rename from Jupiter/Reference_String.h
rename to src/include/Reference_String.h
diff --git a/Jupiter/Reference_String_Imp.h b/src/include/Reference_String_Imp.h
similarity index 100%
rename from Jupiter/Reference_String_Imp.h
rename to src/include/Reference_String_Imp.h
diff --git a/Jupiter/Rehash.h b/src/include/Rehash.h
similarity index 100%
rename from Jupiter/Rehash.h
rename to src/include/Rehash.h
diff --git a/Jupiter/SecureSocket.h b/src/include/SecureSocket.h
similarity index 100%
rename from Jupiter/SecureSocket.h
rename to src/include/SecureSocket.h
diff --git a/Jupiter/Shift_String.h b/src/include/Shift_String.h
similarity index 100%
rename from Jupiter/Shift_String.h
rename to src/include/Shift_String.h
diff --git a/Jupiter/Shift_String_Imp.h b/src/include/Shift_String_Imp.h
similarity index 100%
rename from Jupiter/Shift_String_Imp.h
rename to src/include/Shift_String_Imp.h
diff --git a/Jupiter/Socket.h b/src/include/Socket.h
similarity index 99%
rename from Jupiter/Socket.h
rename to src/include/Socket.h
index 0cc49b9..859ec3f 100644
--- a/Jupiter/Socket.h
+++ b/src/include/Socket.h
@@ -27,7 +27,7 @@
#include
#include "Jupiter.h"
#include "Readable_String.h"
-#include "String.h"
+#include "String.hpp"
struct addrinfo;
struct in_addr6;
diff --git a/Jupiter/String.h b/src/include/String.hpp
similarity index 100%
rename from Jupiter/String.h
rename to src/include/String.hpp
diff --git a/Jupiter/String_Imp.h b/src/include/String_Imp.h
similarity index 99%
rename from Jupiter/String_Imp.h
rename to src/include/String_Imp.h
index ff3aa98..24e3a87 100644
--- a/Jupiter/String_Imp.h
+++ b/src/include/String_Imp.h
@@ -24,7 +24,7 @@
* @brief Provides the implementations for String_Strict and String_Loose.
*/
-#include "String.h"
+#include "String.hpp"
#if !defined va_copy
diff --git a/Jupiter/String_Type.h b/src/include/String_Type.h
similarity index 100%
rename from Jupiter/String_Type.h
rename to src/include/String_Type.h
diff --git a/Jupiter/String_Type_Imp.h b/src/include/String_Type_Imp.h
similarity index 100%
rename from Jupiter/String_Type_Imp.h
rename to src/include/String_Type_Imp.h
diff --git a/Jupiter/TCPSocket.h b/src/include/TCPSocket.h
similarity index 100%
rename from Jupiter/TCPSocket.h
rename to src/include/TCPSocket.h
diff --git a/Jupiter/Thinker.h b/src/include/Thinker.h
similarity index 100%
rename from Jupiter/Thinker.h
rename to src/include/Thinker.h
diff --git a/Jupiter/Timer.h b/src/include/Timer.h
similarity index 100%
rename from Jupiter/Timer.h
rename to src/include/Timer.h
diff --git a/Jupiter/UDPSocket.h b/src/include/UDPSocket.h
similarity index 100%
rename from Jupiter/UDPSocket.h
rename to src/include/UDPSocket.h