From 8f797f18cac480423028f9683a144e88770e9484 Mon Sep 17 00:00:00 2001 From: samuelOsborne Date: Tue, 3 Dec 2024 18:02:47 +0100 Subject: [PATCH] fix: trying renaming of zlib --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index dcef8568..313183b8 100644 --- a/Makefile +++ b/Makefile @@ -346,7 +346,6 @@ endef define SETUP_CMAKE cmake -DCMAKE_INSTALL_PREFIX=$(DEP_ARTIFACTS_DIR) \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -CFLAGS="-Wall -arch arm64" \ -DBUILD_SHARED_LIBS=OFF $(CMAKE_BUILD_SETTINGS) $(PLATFORM) $(TOOLCHAIN_FILE) \ -B $(DEP_BUILD_DIR) \ $(DEP_SOURCE_DIR) @@ -568,9 +567,6 @@ endef define NEW_APPLE_CMAKE_BUILD # Setup cmake -$(call CLEAN_LIBGJPEG) -$(call CLEAN_ZLIB) - $4/$(CMAKE_CACHE): DEP_SOURCE_DIR := $(DEPS_MODULES_DIR)/$3 $4/$(CMAKE_CACHE): DEP_BUILD_DIR := $4 @@ -585,7 +581,9 @@ $4/$(CMAKE_CACHE): DEP_ARTIFACTS_DIR := $$($1_DEPS_ARTIFACTS_DIR) $4/$(CMAKE_CACHE): CMAKE_BUILD_SETTINGS := -GXcode -DCMAKE_MACOSX_BUNDLE=NO $4/$(CMAKE_CACHE): PLATFORM := -DPLATFORM=$$($1_ARCH) $4/$(CMAKE_CACHE): TOOLCHAIN_FILE := -DCMAKE_TOOLCHAIN_FILE=$(PWD)/$(DEPS_MODULES_DIR)/ios-cmake/ios.toolchain.cmake -$4/$(CMAKE_CACHE): +$4/$(CMAKE_CACHE): + @echo "Renaming zconf.h to avoid CMake conflicts..." + mv $(DEPS_MODULES_DIR)/zlib/zconf.h $(DEPS_MODULES_DIR)/zlib/zconf.h.included || true $$(SETUP_CMAKE) # Build