File tree Expand file tree Collapse file tree 3 files changed +18
-6
lines changed
Unix/System.IO.Compression.Native Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Original file line number Diff line number Diff line change 7
7
8
8
#ifdef _WIN32
9
9
#define c_static_assert (e ) static_assert((e),"")
10
+ #endif
11
+
12
+ #if defined(_WIN32 ) || defined(__EMSCRIPTEN__ )
10
13
#include "../../Windows/System.IO.Compression.Native/zlib/zlib.h"
11
14
#else
12
15
#include "pal_utilities.h"
Original file line number Diff line number Diff line change 1
1
project (System .IO.Compression.Native C )
2
2
3
- if (CLR_CMAKE_TARGET_BROWSER )
4
- add_definitions (-s USE_ZLIB )
5
- endif ()
6
-
7
3
include (${CMAKE_CURRENT_LIST_DIR} /extra_libs.cmake )
8
4
9
5
set (NATIVE_LIBS_EXTRA )
@@ -13,7 +9,21 @@ set(NATIVECOMPRESSION_SOURCES
13
9
../../AnyOS/zlib/pal_zlib.c
14
10
)
15
11
16
- if (NOT CLR_CMAKE_TARGET_BROWSER )
12
+ if (CLR_CMAKE_TARGET_BROWSER )
13
+ set (NATIVECOMPRESSION_SOURCES
14
+ ${NATIVECOMPRESSION_SOURCES}
15
+ ../../Windows/System.IO.Compression.Native/zlib/adler32.c
16
+ ../../Windows/System.IO.Compression.Native/zlib/compress.c
17
+ ../../Windows/System.IO.Compression.Native/zlib/crc32.c
18
+ ../../Windows/System.IO.Compression.Native/zlib/deflate.c
19
+ ../../Windows/System.IO.Compression.Native/zlib/inffast.c
20
+ ../../Windows/System.IO.Compression.Native/zlib/inflate.c
21
+ ../../Windows/System.IO.Compression.Native/zlib/inftrees.c
22
+ ../../Windows/System.IO.Compression.Native/zlib/trees.c
23
+ ../../Windows/System.IO.Compression.Native/zlib/zutil.c
24
+ )
25
+ set_source_files_properties (${NATIVECOMPRESSION_SOURCES} PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough )
26
+ else ()
17
27
#Include Brotli include files
18
28
include_directories ("../../AnyOS/brotli/include" )
19
29
Original file line number Diff line number Diff line change 82
82
83
83
<ItemGroup Condition =" '$(OS)' == 'Windows_NT'" >
84
84
<_EmccFlags Include =" @(_EmccCommonFlags)" />
85
- <_EmccFlags Include =" -s USE_ZLIB=1" />
86
85
</ItemGroup >
87
86
88
87
<WriteLinesToFile File =" $(_EmccDefaultsRspPath)"
You can’t perform that action at this time.
0 commit comments