Skip to content

Commit

Permalink
Copy macOS frameworks via cp -a instead of cp -r to not mess up s…
Browse files Browse the repository at this point in the history
…ymbolic links (#8750)
  • Loading branch information
akshayaurora committed Jun 10, 2024
1 parent 3eadfd9 commit 2881d15
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions tools/build_macos_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if [ "$USE_LEGACY_OPENGL" = "0" ]; then
pushd kivy-dependencies/dist
mkdir $MACOS__ANGLE__FOLDER
tar -xzf ../download/${MACOS__ANGLE__FOLDER}.tar.gz -C $MACOS__ANGLE__FOLDER
cp -r ${MACOS__ANGLE__FOLDER}/include/* include
cp -a ${MACOS__ANGLE__FOLDER}/include/* include
cp ${MACOS__ANGLE__FOLDER}/*.dylib lib
rm -r $MACOS__ANGLE__FOLDER
popd
Expand Down Expand Up @@ -107,7 +107,7 @@ pushd $MACOS__LIBPNG__FOLDER
cmake --install build/ --config Release

# for some reason, the framework is installed in lib instead of Frameworks
cp -r ../../dist/lib/png.framework ../../dist/Frameworks
cp -a ../../dist/lib/png.framework ../../dist/Frameworks

popd

Expand All @@ -121,21 +121,21 @@ else
-project Xcode/SDL/SDL.xcodeproj -target Framework -configuration Release \
GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_DEFINITIONS) SDL_VIDEO_OPENGL=0'
fi
cp -r Xcode/SDL/build/Release/SDL2.framework ../../dist/Frameworks
cp -a Xcode/SDL/build/Release/SDL2.framework ../../dist/Frameworks
popd

echo "-- Build SDL2_mixer (Universal)"
pushd $MACOS__SDL2_MIXER__FOLDER
xcodebuild ONLY_ACTIVE_ARCH=NO MACOSX_DEPLOYMENT_TARGET=10.15 \
-project Xcode/SDL_mixer.xcodeproj -target Framework -configuration Release
cp -r Xcode/build/Release/SDL2_mixer.framework ../../dist/Frameworks
cp -a Xcode/build/Release/SDL2_mixer.framework ../../dist/Frameworks
popd

echo "-- Build SDL2_image (Universal)"
pushd $MACOS__SDL2_IMAGE__FOLDER
xcodebuild ONLY_ACTIVE_ARCH=NO MACOSX_DEPLOYMENT_TARGET=10.13 \
-project Xcode/SDL_image.xcodeproj -target Framework -configuration Release
cp -r Xcode/build/Release/SDL2_image.framework ../../dist/Frameworks
cp -a Xcode/build/Release/SDL2_image.framework ../../dist/Frameworks
popd

echo "-- Build SDL2_ttf (Universal)"
Expand All @@ -147,7 +147,7 @@ xcodebuild ONLY_ACTIVE_ARCH=NO MACOSX_DEPLOYMENT_TARGET=10.15 \
HEADER_SEARCH_PATHS='$(HEADER_SEARCH_PATHS) '"$LIBPNG_SEARCH_PATH" \
OTHER_LDFLAGS='$(OTHER_LDFLAGS) -framework png'

cp -r Xcode/build/Release/SDL2_ttf.framework ../../dist/Frameworks
cp -a Xcode/build/Release/SDL2_ttf.framework ../../dist/Frameworks
popd

popd
popd

0 comments on commit 2881d15

Please sign in to comment.