Skip to content

Commit

Permalink
Makefile mac: copy all files from old to GUI bundle
Browse files Browse the repository at this point in the history
the former was a bit error-prone and eg. since 2b9ed6c (2023-05-15),
icon.icns was not copied (just to old bundle but not re-copied to GUI
bundle). Also things like Vulcan shaderes were not copied.

Here, we use a no-clobber option not to override files specific to GUI
bundle.

+ fixed the actaull path of icon.icns inside the bundle
  • Loading branch information
MartinPulec committed Jul 3, 2023
1 parent 5c30b18 commit e75a8e3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -653,10 +653,7 @@ $(GUI_BUNDLE)/Contents/libs: $(BUNDLE)/Contents/libs $(GUI_BUNDLE)
rm -rf $(GUI_BUNDLE)/Contents/Frameworks $(GUI_BUNDLE)/Contents/libs
$(MKDIR_P) $(GUI_BUNDLE)/Contents/Frameworks $(GUI_BUNDLE)/Contents/libs
echo quit | $(DYLIBBUNDLER) $(DYLIBBUNDLER_FLAGS) -of -p @executable_path/../libs/ -cd -b -x $(GUI_BUNDLE)/Contents/MacOS/uv-qt -d $(GUI_BUNDLE)/Contents/libs/; \
cp $(BUNDLE)/Contents/MacOS/* $(GUI_BUNDLE)/Contents/MacOS/
[ -d $(BUNDLE)/Contents/libs ] && cp $(BUNDLE)/Contents/libs/* $(GUI_BUNDLE)/Contents/libs
[ -d $(BUNDLE)/Contents/share ] && { mkdir -p $(GUI_BUNDLE)/Contents/share; cp -r $(BUNDLE)/Contents/share/* $(GUI_BUNDLE)/Contents/share; }
cp -R $(BUNDLE)/Contents/Frameworks/* $(GUI_BUNDLE)/Contents/Frameworks
cp -nR $(BUNDLE)/* $(GUI_BUNDLE) || true
# add Qt frameworks
command -v macdeployqt && macdeployqt $(GUI_BUNDLE) -verbose=2 -executable=$(GUI_BUNDLE)/Contents/MacOS/uv -executable=$(GUI_BUNDLE)/Contents/MacOS/hd-rum-transcode
if [ $(MACOS_LEGACY) = no ]; then \
Expand All @@ -665,7 +662,6 @@ $(GUI_BUNDLE)/Contents/libs: $(BUNDLE)/Contents/libs $(GUI_BUNDLE)
mv -f $$n $$n-real; cp -f $(srcdir)/data/scripts/macos-wrapper $$n; \
done; \
fi
test -d $(GUI_BUNDLE)/Contents/Resources || mkdir $(GUI_BUNDLE)/Contents/Resources
defaults write `pwd`/$(GUI_BUNDLE)/Contents/Info.plist NSCameraUsageDescription 'Allow camera for video capture'
defaults write `pwd`/$(GUI_BUNDLE)/Contents/Info.plist NSMicrophoneUsageDescription 'Allow microphone for audio capture'
defaults write `pwd`/$(GUI_BUNDLE)/Contents/Info.plist CFBundleIconFile icon.icns
Expand Down

0 comments on commit e75a8e3

Please sign in to comment.