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

Tweak wasm things a bit more, download some pregen files for now

Browse source
This commit is contained in:
falkTX 2022-07-15 19:04:40 +01:00
parent ee96a86e24
commit e840ca05da
5 changed files with 1242 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
deps/Makefile vendored
View file

@ -106,7 +106,12 @@ ENV += LDFLAGS='$(LINK_FLAGS)'
SPACE =
SPACE +=
CMAKE = cmake
ifeq ($(WASM),true)
CMAKE = emcmake cmake
else
CMAKE = cmake
endif
CMAKE += -DCMAKE_INSTALL_LIBDIR=lib
CMAKE += -DCMAKE_INSTALL_PREFIX='$(DEP_PATH)'
CMAKE += -DBUILD_SHARED_LIBS=OFF
@ -126,6 +131,10 @@ $(error CI build requires -mmacosx-version-min flag on macOS)
endif
endif
ifeq ($(CROSS_COMPILING),true)
CMAKE += -DCMAKE_CROSSCOMPILING=ON
endif
# make sure debug/release matches
ifeq ($(DEBUG),true)
CMAKE += -DCMAKE_BUILD_TYPE=Debug
@ -171,7 +180,7 @@ DEP_MAKE += DEP_MAC_SDK_FLAGS=
DEP_MAKE += MACHINE=$(MACHINE)$(MACHINE_SUFFIX)
DEP_MAKE += VERBOSE=1
ifeq ($(MACOS),true)
ifeq ($(shell uname -s),Darwin)
ifeq ($(CIBUILD),true)
DEP_MAKE += SHA256SUM="shasum5.28 -a 256"
else