Skip to content

Commit

Permalink
Revert "mac: display warning to use alt-build on <10.15"
Browse files Browse the repository at this point in the history
This reverts commit 2b45ba9.
  • Loading branch information
MartinPulec committed Jun 30, 2023
1 parent 6dd8d8d commit 643e168
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 32 deletions.
7 changes: 0 additions & 7 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ REAL_CUDA_COMPILER = "@CUDA_COMPILER@"
CUDA_COMPILER_0 = @echo "Compiling $<..."; $(REAL_CUDA_COMPILER)
CUDA_COMPILER_1 = $(REAL_CUDA_COMPILER)
CUDA_COMPILER = $(CUDA_COMPILER_$(VERBOSE))
MACOS_LEGACY = @MACOS_LEGACY@
SYSTEM = @system@

GUI_EXE = @GUI_EXE@
Expand Down Expand Up @@ -659,12 +658,6 @@ $(GUI_BUNDLE)/Contents/libs: $(BUNDLE)/Contents/libs $(GUI_BUNDLE)
cp -R $(BUNDLE)/Contents/Frameworks/* $(GUI_BUNDLE)/Contents/Frameworks
# 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 \
for n in $(GUI_BUNDLE)/Contents/MacOS/*; do \
if expr $$n : '.*-real' >/dev/null; then continue; fi; \
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'
Expand Down
5 changes: 0 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,6 @@ if test $system = Linux; then
fi

if test $system = MacOSX; then
MACOS_LEGACY=no
os_version_major=`uname -r |cut -d . -f 1`
if test $os_version_major -lt 19; then # Darwin 19.0.0 is macOS 10.15
MACOS_LEGACY=yes
fi
COMMON_OSX_FLAGS="${COMMON_OSX_FLAGS:+$COMMON_OSX_FLAGS }-iframework data/redists -stdlib=libc++"
CFLAGS="$CFLAGS $COMMON_OSX_FLAGS"
CPPFLAGS="$CPPFLAGS $COMMON_OSX_FLAGS"
Expand Down
20 changes: 0 additions & 20 deletions data/scripts/macos-wrapper

This file was deleted.

0 comments on commit 643e168

Please sign in to comment.