Skip to content

Commit

Permalink
fix: trying renaming of zlib
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelOsborne committed Dec 3, 2024
1 parent b44991f commit 6a126fe
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,11 @@ define CLEAN_LIBGJPEG
rm -f /usr/local/lib/libjpeg*
endef

define CLEAN_ZLIB
echo "Renaming Zlib header file so cmake doesn't fail.."
mv deps/modules/zlib/zconf.h deps/modules/zlib/zconf.h.backup
endef

define SIMPLE_CARGO_BUILD
cargo build \
--manifest-path $(PROJECT_DIR)/Cargo.toml \
Expand Down Expand Up @@ -581,7 +586,8 @@ $4/$(CMAKE_CACHE):
$$(SETUP_CMAKE)

# Build
# $(call CLEAN_LIBGJPEG)
$(call CLEAN_LIBGJPEG)
$(call CLEAN_ZLIB)
$$($1_DEPS_LIB_DIR)/$5: CMAKE_BUILD_DIR := $4
$$($1_DEPS_LIB_DIR)/$5: CMAKE_BUILD_OPTIONS := $(if $(filter $($1_SUBSYSTEM),$(APPLE_IOS)),CODE_SIGNING_ALLOWED=NO,)
$$($1_DEPS_LIB_DIR)/$5: $4/$(CMAKE_CACHE)
Expand Down

0 comments on commit 6a126fe

Please sign in to comment.