diff --git a/.github/scripts/macOS/install_others.sh b/.github/scripts/macOS/install_others.sh index 638e3e0b4..34b8595db 100755 --- a/.github/scripts/macOS/install_others.sh +++ b/.github/scripts/macOS/install_others.sh @@ -106,22 +106,16 @@ install_soundfont() {( )} install_syphon() {( - if [ "$(uname -m)" = arm64 ]; then - git clone --depth 1 https://github.com/Syphon/\ -Syphon-Framework.git - cd Syphon-Framework - xcodebuild LD_DYLIB_INSTALL_NAME=@executable_path/../\ -Frameworks/Syphon.framework/Versions/A/Syphon - cd build/Release - else - curl -LO https://github.com/Syphon/Syphon-Framework/releases/\ -download/5/Syphon.SDK.5.zip - unzip Syphon.SDK.5.zip - cd 'Syphon SDK 5' - fi - sudo cp -R 'Syphon.framework' \ - "$(xcrun --show-sdk-path)/System/Library/Frameworks/" -)} + git clone --depth 1 https://github.com/Syphon/Syphon-Framework.git + cd Syphon-Framework + xcodebuild + sudo cp -R 'build/Release/Syphon.framework' \ + /usr/local/lib +) + export COMMON_OSX_FLAGS="${COMMON_OSX_FLAGS+$COMMON_OSX_FLAGS }\ +-F/usr/local/lib" + printf '%b' "COMMON_OSX_FLAGS=$COMMON_OSX_FLAGS\n" >> "$GITHUB_ENV" +} show_help= if [ $# -eq 1 ] && { [ "$1" = -h ] || [ "$1" = --help ] || [ "$1" = help ]; }; then diff --git a/Makefile.in b/Makefile.in index 9ef29663d..2aaa6ca59 100644 --- a/Makefile.in +++ b/Makefile.in @@ -236,10 +236,6 @@ src/dir-stamp: $(MKDIR_P) $(dir $@) touch $@ -Frameworks/Syphon.framework: - $(MKDIR_P) Frameworks - $(CP) -R $$(xcrun --show-sdk-path)/System/Library/Frameworks//Syphon.framework Frameworks/ - $(TARGET): src/dir-stamp $(ULTRAGRID_OBJS) $(GENERATED_HEADERS) $(BIN_DEPS) $(MKDIR_P) $(dir $@) $(LINKER) $(LDFLAGS) $(ULTRAGRID_OBJS) $(LIBS) $(ULTRAGRID_LIBS) -o $(TARGET) diff --git a/configure.ac b/configure.ac index 35e7a457a..9a7ee50cc 100644 --- a/configure.ac +++ b/configure.ac @@ -3015,7 +3015,6 @@ if test "$syphon_req" != no && test "$system" = MacOSX; then if test $my_cv_framework_Syphon = yes then AC_DEFINE([HAVE_SYPHON], [1], [Build with Syphon support]) - BIN_DEPS="${BIN_DEPS:+$BIN_DEPS }Frameworks/Syphon.framework" add_module syphon "src/syphon_server.o src/video_capture/syphon.o" "-framework Syphon" syphon=yes fi