Browse Source

fix emar and emranlib usage for wasm builds

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.09
falkTX 2 years ago
parent
commit
4f3fdd239e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 13 additions and 1 deletions
  1. +12
    -0
      deps/Makefile
  2. +1
    -1
      deps/PawPaw

+ 12
- 0
deps/Makefile View File

@@ -134,6 +134,18 @@ endif
CMAKE += -DCMAKE_OSX_SYSROOT=$(shell xcrun --sdk macosx --show-sdk-path)
endif

# fix emar and emranlib usage
ifeq ($(WASM),true)
CMAKE_AR = $(shell which $(AR))
CMAKE_RANLIB = $(shell which $(RANLIB))
CMAKE += -DCMAKE_AR=$(CMAKE_AR)
CMAKE += -DCMAKE_C_COMPILER_AR=$(CMAKE_AR)
CMAKE += -DCMAKE_CXX_COMPILER_AR=$(CMAKE_AR)
CMAKE += -DCMAKE_RANLIB=$(CMAKE_RANLIB)
CMAKE += -DCMAKE_C_COMPILER_RANLIB=$(CMAKE_RANLIB)
CMAKE += -DCMAKE_CXX_COMPILER_RANLIB=$(CMAKE_RANLIB)
endif

# fix cross-compilation for windows
ifeq ($(WINDOWS),true)
CMAKE += -G 'Unix Makefiles'


+ 1
- 1
deps/PawPaw

@@ -1 +1 @@
Subproject commit 3960c15767a65f20e6e541958bec8ae250bc7f71
Subproject commit 7ef509e689656fc4cd5be814a32f54dac37af931

Loading…
Cancel
Save