Skip to content

Commit

Permalink
fix: zlib renaming worked, fixing jpeg arch symbols - testing adding …
Browse files Browse the repository at this point in the history
…cmake_osx_sysroot
  • Loading branch information
samuelOsborne committed Dec 5, 2024
1 parent fb96731 commit ed9e8e0
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ THORVG_LIB := libthorvg.a

CMAKE_TOOLCHAIN_FILE := toolchain.cmake
CMAKE_C_FLAGS := ""
CMAKE_OSX_SYSROOTs := ""
CMAKE_OSX_SYSROOT := ""
CMAKE_MAKEFILE := Makefile
CMAKE_CACHE := CMakeCache.txt

Expand Down Expand Up @@ -881,6 +881,18 @@ else
$$($1_LOCAL_ARCH_BUILD_DIR)/$(CMAKE_MAKEFILE): CMAKE_C_FLAGS := -DCMAKE_C_FLAGS="" # Reset to empty if not LIBJPEG_TURBO
endif

ifneq ($(filter $$($1_PLATFORM), MacOSX),)
$$($1_LOCAL_ARCH_BUILD_DIR)/$(CMAKE_MAKEFILE): OSX_SYSROOT := -DCMAKE_OSX_SYSROOT=macosx
endif

ifneq ($(filter $$($1_PLATFORM), iPhoneOS),)
$$($1_LOCAL_ARCH_BUILD_DIR)/$(CMAKE_MAKEFILE): OSX_SYSROOT := -DCMAKE_OSX_SYSROOT=iphoneos
endif

ifneq ($(filter $$($1_PLATFORM), iPhoneSimulator),)
$$($1_LOCAL_ARCH_BUILD_DIR)/$(CMAKE_MAKEFILE): OSX_SYSROOT := -DCMAKE_OSX_SYSROOT=iphonesimulator
endif

$$($1_LOCAL_ARCH_BUILD_DIR)/$(CMAKE_MAKEFILE): DEP_SOURCE_DIR := $(DEPS_MODULES_DIR)/$2
$$($1_LOCAL_ARCH_BUILD_DIR)/$(CMAKE_MAKEFILE): DEP_BUILD_DIR := $$($1_LOCAL_ARCH_BUILD_DIR)
$$($1_LOCAL_ARCH_BUILD_DIR)/$(CMAKE_MAKEFILE): DEP_ARTIFACTS_DIR := $(LOCAL_ARCH_ARTIFACTS_DIR)
Expand Down

0 comments on commit ed9e8e0

Please sign in to comment.