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 57d0fef commit 8f797f1
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 8f797f1

Please sign in to comment.