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 b2dab7c commit fb96731
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .mac-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ check_for() {
fi

echo "Checking for ${GREEN}${app}${NC} ..."
echo "${RED}=>${NC} Printing direectory contents.."
echo "${RED}=>${NC} Xcode.app"
ls /Applications/Xcode.app/*
ls /Applications/Xcode.app/Contents/Developer/Platforms
echo "${RED}=>${NC} MacOSX.platform"
ls /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
echo "${RED}=>${NC} iPhoneOS.platform"
ls /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs
echo "${RED}=>${NC} IponeSimulator.platform"
ls /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs
if ! which "${app}" &>/dev/null; then
echo "${RED}=>${NC} Could not find ${app}${install_url}"

Expand Down
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,18 @@ else
$4/$(CMAKE_CACHE): C_FLAGS := -DCMAKE_C_FLAGS="" # Reset to empty if not LIBJPEG_TURBO
endif

$4/$(CMAKE_CACHE): OSX_SYSROOT := -DCMAKE_OSX_SYSROOT=$$(shell xcrun --sdk $$($1_SDK) --show-sdk-path)
ifneq ($(filter $$($1_PLATFORM), MacOSX),)
$4/$(CMAKE_CACHE): OSX_SYSROOT := -DCMAKE_OSX_SYSROOT=macosx
endif

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

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

$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)
Expand Down

0 comments on commit fb96731

Please sign in to comment.