Skip to content

Commit b2eb11f

Browse files
authored
osx template and xcode_project.sh edit (#7551)
1 parent e5fb716 commit b2eb11f

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

scripts/osx/xcode_project.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@ msg() {
1414
copy_resources() {
1515
msg "Copying Resources - Icon and libfmod"
1616

17+
# echo mkdir -p "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/"
1718
mkdir -p "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/"
1819
# Copy default icon file into App/Resources
19-
rsync -aved --delete --exclude='.DS_Store' "$ICON_FILE" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/"
20+
21+
if [[ $ICON_FILE != "" ]] ; then
22+
# echo rsync -aved --delete --exclude='.DS_Store' "$ICON_FILE" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/"
23+
rsync -aved --delete --exclude='.DS_Store' "$ICON_FILE" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/"
24+
fi
2025
# Copy libfmod and change install directory for fmod to run
2126
if [ -z "$OF_NO_FMOD" ] ; then
27+
echo rsync -aved --delete --ignore-existing "$OF_PATH/libs/fmod/lib/osx/libfmod.dylib" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/";
2228
rsync -aved --delete --ignore-existing "$OF_PATH/libs/fmod/lib/osx/libfmod.dylib" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/";
2329
fi
2430
# Not needed as we now call install_name_tool -id @loader_path/../Frameworks/libfmod.dylib libfmod.dylib on the dylib directly which prevents the need for calling every post build - keeping here for reference and possible legacy usage

scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"inputPaths": [],
105105
"buildActionMask": "2147483647",
106106
"shellPath": "/bin/sh",
107+
"showEnvVarsInLog": "0",
107108
"outputPaths": [],
108109
"isa": "PBXShellScriptBuildPhase",
109110
"runOnlyForDeploymentPostprocessing": "0",

0 commit comments

Comments
 (0)