brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert a few things to get zstd working in wasm, deal with it later

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-07-16 00:30:44 +01:00
parent dab443d2c3
commit dd185edf96
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
deps/Makefile vendored
View file

@ -106,12 +106,7 @@ ENV += LDFLAGS='$(LINK_FLAGS)'
SPACE = SPACE =
SPACE += SPACE +=
ifeq ($(WASM),true)
CMAKE = emcmake cmake
else
CMAKE = cmake CMAKE = cmake
endif
CMAKE += -DCMAKE_INSTALL_LIBDIR=lib CMAKE += -DCMAKE_INSTALL_LIBDIR=lib
CMAKE += -DCMAKE_INSTALL_PREFIX='$(DEP_PATH)' CMAKE += -DCMAKE_INSTALL_PREFIX='$(DEP_PATH)'
CMAKE += -DBUILD_SHARED_LIBS=OFF CMAKE += -DBUILD_SHARED_LIBS=OFF
@ -131,10 +126,6 @@ $(error CI build requires -mmacosx-version-min flag on macOS)
endif endif
endif endif
ifeq ($(CROSS_COMPILING),true)
CMAKE += -DCMAKE_CROSSCOMPILING=ON
endif
# make sure debug/release matches # make sure debug/release matches
ifeq ($(DEBUG),true) ifeq ($(DEBUG),true)
CMAKE += -DCMAKE_BUILD_TYPE=Debug CMAKE += -DCMAKE_BUILD_TYPE=Debug