diff --git a/Aurora.json b/Aurora.json index 33c8a488..ac097d6a 100644 --- a/Aurora.json +++ b/Aurora.json @@ -6,8 +6,8 @@ "impDefines": ["AURORA_ENGINE_KERNEL"], "staticImpDefines": "AURORA_ENGINE_KERNEL_STATIC", "defines": [], - "soft-depends": ["wxwidgets", "glm"], - "depends": ["AuroraInterfaces", "AuroraEnum", "mimalloc", "uuid", "fmt", "json", "bzip2", "ltc", "o1heap", "zstd", "zlib", "lz4", "mbedtls"], + "soft-depends": ["wxwidgets", "glm", "bzip2", "lz4"], + "depends": ["AuroraInterfaces", "AuroraEnum", "mimalloc", "uuid", "fmt", "json", "ltc", "o1heap", "zstd", "zlib", "mbedtls"], "include-depends": ["fmt", "uuid", "AuroraInterfaces", "AuroraEnum"], "features": ["guess-platform-code"], "linkSources": "Source/Alloc.cpp", diff --git a/Source/Compression/BlockCompressor.cpp b/Source/Compression/BlockCompressor.cpp index 6fc21f32..8f5e5719 100644 --- a/Source/Compression/BlockCompressor.cpp +++ b/Source/Compression/BlockCompressor.cpp @@ -42,8 +42,10 @@ namespace Aurora::Compression break; #endif case ECompresionType::eBZIP2: + #if defined(_AUHAS_BZIP2) ret = _new BZIPDeflate(info); break; + #endif #if defined(_AUHAS_LZ4) case ECompresionType::eLZ4: ///ret = new LZ4Deflate(info); diff --git a/Source/Compression/BlockDecompressor.cpp b/Source/Compression/BlockDecompressor.cpp index 8c33531f..b2535111 100644 --- a/Source/Compression/BlockDecompressor.cpp +++ b/Source/Compression/BlockDecompressor.cpp @@ -43,7 +43,9 @@ namespace Aurora::Compression break; #endif case ECompresionType::eBZIP2: + #if defined(_AUHAS_BZIP2) ret = _new BZIPInflate(info); + #endif break; #if defined(_AUHAS_LZ4) case ECompresionType::eLZ4: diff --git a/Source/Compression/Compressors/LZ4Decompressor.hpp b/Source/Compression/Compressors/LZ4Decompressor.hpp index 6e670e4b..2a703ba7 100644 --- a/Source/Compression/Compressors/LZ4Decompressor.hpp +++ b/Source/Compression/Compressors/LZ4Decompressor.hpp @@ -44,7 +44,7 @@ namespace Aurora::Compression return {}; } - auto bufferSize = meta.internalStreamSize / 2; + auto bufferSize = meta.internalStreamSize; this->bufferIn_ = AuSPtr(new char[bufferSize], AuDefaultDeleter()); @@ -71,7 +71,7 @@ namespace Aurora::Compression size_t bytesRemInFrame {}; LZ4F_decompressOptions_t opts {}; - auto bufferSize = meta.internalStreamSize / 2; + auto bufferSize = meta.internalStreamSize; while (inputStat < input) { diff --git a/Source/Compression/StreamCompression.cpp b/Source/Compression/StreamCompression.cpp index e19b2154..3d8310af 100644 --- a/Source/Compression/StreamCompression.cpp +++ b/Source/Compression/StreamCompression.cpp @@ -9,11 +9,15 @@ #include "Compression.hpp" #include "StreamCompression.hpp" -#include "bzlib.h" +#if defined(_AUHAS_BZIP2) + #include "bzlib.h" +#endif #include "zstd.h" #include "zlib.h" -#include "lz4.h" -#include "lz4frame.h" +#if defined(_AUHAS_LZ4) + #include "lz4.h" + #include "lz4frame.h" +#endif namespace Aurora::Compression { @@ -360,6 +364,7 @@ namespace Aurora::Compression static bool CompressBZip2(const CompressionPipe &stream, const CompressionInfo &info) { + #if defined(_AUHAS_BZIP2) int ret, flush; bz_stream strm {}; char in[kChunkSize]; @@ -429,10 +434,14 @@ namespace Aurora::Compression BZ2_bzCompressEnd(&strm); return true; + #else + return false; + #endif } static bool DecompressBZip2(const CompressionPipe &stream) { + #if defined(_AUHAS_BZIP2) int ret; bz_stream strm {}; char in[kChunkSize]; @@ -503,10 +512,14 @@ namespace Aurora::Compression BZ2_bzDecompressEnd(&strm); return true; + #else + return false; + #endif } static bool CompressLZ4(const CompressionPipe &stream, const CompressionInfo &info) { + #if defined(_AUHAS_LZ4) bool ret; LZ4F_cctx *cctxPtr; LZ4F_preferences_t pref {}; @@ -572,10 +585,14 @@ namespace Aurora::Compression LZ4F_freeCompressionContext(cctxPtr); return ret; + #else + return false; + #endif } static bool DecompressLZ4(const CompressionPipe &pipe, AuUInt32 frameMaxSize) { + #if defined(_AUHAS_LZ4) bool ret = true; LZ4F_dctx *dctxPtr; AuUInt32 inputStat = 0, outputStat = 0; @@ -658,6 +675,9 @@ namespace Aurora::Compression LZ4F_freeDecompressionContext(dctxPtr); return ret; + #else + return false; + #endif } AUKN_SYM bool Compress(const CompressionPipe &stream, const CompressionInfo &info) diff --git a/Source/Entrypoint.cpp b/Source/Entrypoint.cpp index 6292e06d..226ae0c4 100644 --- a/Source/Entrypoint.cpp +++ b/Source/Entrypoint.cpp @@ -23,13 +23,15 @@ #include "Threading/Threads/OSThread.hpp" #include "SWInfo/SWInfo.hpp" #if defined(AURORA_PLATFORM_WIN32) -#include "Extensions/Win32/DarkTheme.hpp" + #include "Extensions/Win32/DarkTheme.hpp" #endif +#include "IO/Net/Net.hpp" #include "Process/ProcessMap.hpp" #include "Exit/Exit.hpp" #include "CmdLine/CmdLine.hpp" #include "Grug/Grug.hpp" + static void Init() { #if defined(AURORA_PLATFORM_WIN32) @@ -37,12 +39,16 @@ static void Init() #endif Crypto::InitCrypto(); + Aurora::Process::InitProcessMap(); + Aurora::SWInfo::InitSwInfo(); Aurora::Threading::Threads::InitThreading(); Aurora::Exit::InitExit(); Aurora::Console::Init(); Aurora::IO::FS::InitResources(); - Aurora::Telemetry::Init(); Aurora::Console::Init2(); + Aurora::HWInfo::Init(); + Aurora::Telemetry::Init(); + Aurora::IO::Net::InitNetworking(); Aurora::Grug::InitGrug(); Aurora::Debug::InitDebug(); Aurora::Locale::Init(); @@ -51,9 +57,6 @@ static void Init() Aurora::RNG::Init(); Aurora::Hashing::InitHashing(); Aurora::Async::InitAsync(); - Aurora::SWInfo::InitSwInfo(); - Aurora::HWInfo::Init(); - Aurora::Process::InitProcessMap(); } static void Pump() @@ -68,6 +71,7 @@ static void Deinit() Aurora::Async::ShutdownAsync(); Aurora::Grug::DeinitGrug(); Aurora::Console::Exit(); + Aurora::IO::Net::DeinitNetworking(); Aurora::Processes::Deinit(); Aurora::Exit::DeinitExit(); }