Skip to content

Commit 44c04ec

Browse files
committed
fixes& speedups compilation
1 parent 8edd12b commit 44c04ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+39
-16217
lines changed

main.sharpmake.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ public Common() : base(typeof(CustomTarget))
6363
CustomProperties.Add("VcpkgEnableManifest", "true");
6464
CustomProperties.Add("VcpkgTriplet", "x64-windows-static");
6565
CustomProperties.Add("VcpkgConfiguration", "Release");
66+
67+
// BlobWorkFileCount = 8;
68+
// GeneratableBlobCount = 8;
6669
}
6770

6871
[Configure]
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "../../../extlibs/lzma/Types.h"
2+
#include <7zip/C/7zTypes.h>
33

44
namespace detail
55
{
@@ -9,8 +9,8 @@ namespace detail
99
public:
1010
lzma_alloc()
1111
{
12-
this->Alloc = [](void*, size_t size) { return malloc(size); };
13-
this->Free = [](void*, void* address) { free(address); };
12+
this->Alloc = [](ISzAllocPtr, size_t size) { return malloc(size); };
13+
this->Free = [](ISzAllocPtr, void* address) { free(address); };
1414
}
1515
};
1616
}

sources/3rdparty/ZipLib/compression/lzma/detail/lzma_handle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include "lzma_alloc.h"
33

4-
#include "../../../extlibs/lzma/LzmaEnc.h"
4+
#include "7zip/C/LzmaEnc.h"
55

66
namespace detail
77
{

sources/3rdparty/ZipLib/compression/lzma/detail/lzma_header.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include "lzma_handle.h"
33
#include "lzma_out_stream.h"
44

5-
#include "../../../extlibs/lzma/7zVersion.h"
6-
#include "../../../extlibs/lzma/LzmaEnc.h"
5+
//#include "7zip/C/Version.h"
6+
#include "7zip/C/LzmaEnc.h"
77

88
namespace detail
99
{
@@ -17,8 +17,8 @@ namespace detail
1717

1818
lzma_header()
1919
{
20-
_header[0] = MY_VER_MAJOR;
21-
_header[1] = MY_VER_MINOR;
20+
_header[0] = 1;// MY_VER_MAJOR;
21+
_header[1] = 2;// MY_VER_MINOR;
2222
_header[2] = LZMA_PROPS_SIZE & 0xFF;
2323
_header[3] = (LZMA_PROPS_SIZE >> 8) & 0xFF;
2424
}

sources/3rdparty/ZipLib/compression/lzma/detail/lzma_in_stream.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "../../../extlibs/lzma/Types.h"
2+
#include "7zip/C/7zTypes.h"
33

44
#include <condition_variable>
55
#include <mutex>
@@ -27,9 +27,9 @@ namespace detail
2727
, _internalInputBuffer(nullptr)
2828
, _endOfStream(false)
2929
{
30-
this->Read = [](void* p, void* buf, size_t* size) -> SRes
30+
this->Read = [](const ISeqInStream* p, void* buf, size_t* size) -> SRes
3131
{
32-
lzma_in_stream* pthis = static_cast<lzma_in_stream*>(p);
32+
lzma_in_stream* pthis = const_cast<lzma_in_stream*>(reinterpret_cast<const lzma_in_stream*>(p));
3333
return pthis->read(buf, size);
3434
};
3535
}

sources/3rdparty/ZipLib/compression/lzma/detail/lzma_out_stream.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "../../../extlibs/lzma/Types.h"
2+
#include "7zip/C/7zTypes.h"
33

44
namespace detail
55
{
@@ -14,9 +14,9 @@ namespace detail
1414
: _bytesWritten(0)
1515
, _stream(nullptr)
1616
{
17-
this->Write = [](void* p, const void* buf, size_t size)
17+
this->Write = [](const ISeqOutStream* p, const void* buf, size_t size)
1818
{
19-
lzma_out_stream* pthis = static_cast<lzma_out_stream*>(p);
19+
lzma_out_stream* pthis = const_cast<lzma_out_stream*>(reinterpret_cast<const lzma_out_stream*>(p));
2020
return pthis->write(buf, size);
2121
};
2222
}

sources/3rdparty/ZipLib/compression/lzma/lzma_decoder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "detail/lzma_alloc.h"
55
#include "lzma_decoder_properties.h"
66

7-
#include "../../extlibs/lzma/LzmaDec.h"
7+
#include "7zip/C/LzmaDec.h"
88

99
#include <cstdint>
1010

sources/3rdparty/ZipLib/compression/lzma/lzma_encoder_properties.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "detail/lzma_handle.h"
55

6-
#include "../../extlibs/lzma/LzmaEnc.h"
6+
#include "7zip/C/LzmaEnc.h"
77

88
struct lzma_encoder_properties
99
: compression_encoder_properties_interface

sources/3rdparty/ZipLib/extlibs/lzma/7z.h

Lines changed: 0 additions & 203 deletions
This file was deleted.

sources/3rdparty/ZipLib/extlibs/lzma/7zAlloc.c

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)