diff options
| author | Jo Shields <joshield@microsoft.com> | 2019-11-12 11:31:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 11:31:08 +0300 |
| commit | 8bceb40878f3ff21cf3e521d0fe987a8fd6f1326 (patch) | |
| tree | 62f91050858ad1773a42c5f636ddff537f9c4545 /sdks | |
| parent | 8683fa6db798298d576c120dd9e1443cd3c5b6de (diff) | |
Move zlib to its own directory, and re-enable subdir-objects
This has the following benefits:
* Clearer structure for mirroring
* Slight build time improvement on bundled zlib use (as it only builds once)
* Removes pages of subdir-objects spew from autogen
Diffstat (limited to 'sdks')
| -rw-r--r-- | sdks/builds/wasm.mk | 22 | ||||
| -rw-r--r-- | sdks/wasm/Makefile | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk index a913e697da7..dac4380e5a2 100644 --- a/sdks/builds/wasm.mk +++ b/sdks/builds/wasm.mk @@ -6,19 +6,19 @@ EMSCRIPTEN_LOCAL_SDK_DIR=$(TOP)/sdks/builds/toolchains/emsdk EMSCRIPTEN_SDK_DIR ?= $(EMSCRIPTEN_LOCAL_SDK_DIR) -MONO_SUPPORT=$(TOP)/support +MONO_ZLIB_DIR=$(TOP)/mono/zlib ZLIB_HEADERS = \ - $(MONO_SUPPORT)/crc32.h \ - $(MONO_SUPPORT)/deflate.h \ - $(MONO_SUPPORT)/inffast.h \ - $(MONO_SUPPORT)/inffixed.h \ - $(MONO_SUPPORT)/inflate.h \ - $(MONO_SUPPORT)/inftrees.h \ - $(MONO_SUPPORT)/trees.h \ - $(MONO_SUPPORT)/zconf.h \ - $(MONO_SUPPORT)/zlib.h \ - $(MONO_SUPPORT)/zutil.h + $(MONO_ZLIB_DIR)/crc32.h \ + $(MONO_ZLIB_DIR)/deflate.h \ + $(MONO_ZLIB_DIR)/inffast.h \ + $(MONO_ZLIB_DIR)/inffixed.h \ + $(MONO_ZLIB_DIR)/inflate.h \ + $(MONO_ZLIB_DIR)/inftrees.h \ + $(MONO_ZLIB_DIR)/trees.h \ + $(MONO_ZLIB_DIR)/zconf.h \ + $(MONO_ZLIB_DIR)/zlib.h \ + $(MONO_ZLIB_DIR)/zutil.h ifeq ($(UNAME),Darwin) WASM_LIBCLANG=$(EMSCRIPTEN_SDK_DIR)/upstream/lib/libclang.dylib diff --git a/sdks/wasm/Makefile b/sdks/wasm/Makefile index 38751d8c6b3..6b3acea961d 100644 --- a/sdks/wasm/Makefile +++ b/sdks/wasm/Makefile @@ -24,7 +24,7 @@ MINI_PATH=$(TOP)/mono/mini CSC?= MONO_PATH=$(TOP)/mcs/class/lib/build $(TOP)/sdks/builds/bcl/runtime/mono-wrapper $(CSC_LOCATION) CSC_FLAGS := /debug:portable /noconfig /nostdlib /nologo /langversion:latest API_REFS=$(TOP)/external/binary-reference-assemblies/v4.6 -MONO_SUPPORT=$(WASM_RUNTIME_DIR)/include/support +MONO_ZLIB_DIR=$(TOP)/mono/zlib PACKAGER=mono --debug packager.exe --no-native-strip @@ -39,16 +39,16 @@ DOTNET_PACK=$(DOTNET_CMD) pack DOTNET_BUILD=$(DOTNET_CMD) build ZLIB_HEADERS = \ - $(MONO_SUPPORT)/crc32.h \ - $(MONO_SUPPORT)/deflate.h \ - $(MONO_SUPPORT)/inffast.h \ - $(MONO_SUPPORT)/inffixed.h \ - $(MONO_SUPPORT)/inflate.h \ - $(MONO_SUPPORT)/inftrees.h \ - $(MONO_SUPPORT)/trees.h \ - $(MONO_SUPPORT)/zconf.h \ - $(MONO_SUPPORT)/zlib.h \ - $(MONO_SUPPORT)/zutil.h + $(MONO_ZLIB_DIR)/crc32.h \ + $(MONO_ZLIB_DIR)/deflate.h \ + $(MONO_ZLIB_DIR)/inffast.h \ + $(MONO_ZLIB_DIR)/inffixed.h \ + $(MONO_ZLIB_DIR)/inflate.h \ + $(MONO_ZLIB_DIR)/inftrees.h \ + $(MONO_ZLIB_DIR)/trees.h \ + $(MONO_ZLIB_DIR)/zconf.h \ + $(MONO_ZLIB_DIR)/zlib.h \ + $(MONO_ZLIB_DIR)/zutil.h MINI_TEST_FILES= \ TestDriver.cs \ |