diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2b9669a6f..089cd387b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -4,13 +4,15 @@ on: [push] env: # TeamTalk unit test environment variables - VIDEODEVICEID: None - VERBOSE: 0 GITHUBSKIP: 1 + INPUTDEVICEID: 1978 + OUTPUTDEVICEID: 1978 + VERBOSE: 0 + VIDEODEVICEID: None jobs: build: - runs-on: macos-12 + runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -48,7 +50,7 @@ jobs: working-directory: ${{runner.workspace}}/TeamTalk5 shell: bash run: | - make CMAKE_EXTRA="-DFEATURE_WEBRTC=OFF -DBUILD_TEAMTALK_LIBRARY_UNITTEST_CATCH2=ON -DBUILD_TEAMTALK_LIBRARY_UNITTEST_CATCH2_PERF=OFF -DBUILD_TEAMTALK_CLIENT_QTTEAMTALK_PRODUCT=ON -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install" -C Build mac + make CMAKE_EXTRA="-DFEATURE_WEBRTC=OFF -DFEATURE_PORTAUDIO=OFF -DBUILD_TEAMTALK_LIBRARY_UNITTEST_CATCH2=ON -DBUILD_TEAMTALK_LIBRARY_UNITTEST_CATCH2_PERF=OFF -DBUILD_TEAMTALK_CLIENT_QTTEAMTALK_PRODUCT=ON -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install" -C Build mac - name: Start TeamTalk Standard Server working-directory: ${{runner.workspace}}/TeamTalk5 diff --git a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt index 11e3557bd..9652cc3f9 100644 --- a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt +++ b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt @@ -141,28 +141,31 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set (INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_FFMPEG}) endif() - find_library(COCOA_LIBRARY Cocoa) - find_library(AVFOUNDATION_LIBRARY AVFoundation) - find_library(COREMEDIA_LIBRARY CoreMedia) - find_library(OPENGL_LIBRARY OpenGL) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - find_library(VIDEODECODEACCELERATION_LIBRARY VideoDecodeAcceleration) - find_library(QUARTZCORE_LIBRARY QuartzCore) - find_library(BZ2_LIBRARY bz2) find_library (AUDIOTOOLBOX_LIBRARY AudioToolBox) - find_library (VIDEOTOOLBOX_LIBRARY VideoToolBox) + find_library (AVFOUNDATION_LIBRARY AVFoundation) + find_library (BZ2_LIBRARY bz2) + find_library (COCOA_LIBRARY Cocoa) + find_library (COREAUDIO_LIBRARY CoreAudio) + find_library (COREFOUNDATION_LIBRARY CoreFoundation) + find_library (COREMEDIA_LIBRARY CoreMedia) find_library (METAL_LIBRARY Metal) + find_library (OPENGL_LIBRARY OpenGL) + find_library (QUARTZCORE_LIBRARY QuartzCore) + find_library (VIDEODECODEACCELERATION_LIBRARY VideoDecodeAcceleration) + find_library (VIDEOTOOLBOX_LIBRARY VideoToolBox) - set (FFMPEG_LINK ${COCOA_LIBRARY} ${AVFOUNDATION_LIBRARY} + set (FFMPEG_LINK ${AUDIOTOOLBOX_LIBRARY} + ${AVFOUNDATION_LIBRARY} + ${BZ2_LIBRARY} + ${COCOA_LIBRARY} + ${COREAUDIO_LIBRARY} + ${COREFOUNDATION_LIBRARY} ${COREMEDIA_LIBRARY} + ${METAL_LIBRARY} ${OPENGL_LIBRARY} - ${COREFOUNDATION_LIBRARY} - ${VIDEODECODEACCELERATION_LIBRARY} ${QUARTZCORE_LIBRARY} - ${BZ2_LIBRARY} - ${AUDIOTOOLBOX_LIBRARY} - ${VIDEOTOOLBOX_LIBRARY} - ${METAL_LIBRARY}) + ${VIDEODECODEACCELERATION_LIBRARY} + ${VIDEOTOOLBOX_LIBRARY}) add_library(ffmpeg-avdevice STATIC IMPORTED GLOBAL) if (TOOLCHAIN_BUILD_EXTERNALPROJECTS) diff --git a/Library/TeamTalkLib/build/portaudio/CMakeLists.txt b/Library/TeamTalkLib/build/portaudio/CMakeLists.txt index 5e84dfa18..6c79e058f 100644 --- a/Library/TeamTalkLib/build/portaudio/CMakeLists.txt +++ b/Library/TeamTalkLib/build/portaudio/CMakeLists.txt @@ -59,10 +59,10 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set (INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_PORTAUDIO}) endif() - find_library (CARBON_LIBRARY Carbon) + find_library (AUDIOTOOLBOX_LIBRARY AudioToolBox) find_library (AUDIOUNIT_LIBRARY AudioUnit) + find_library (CARBON_LIBRARY Carbon) find_library (COREAUDIO_LIBRARY CoreAudio) - find_library (AUDIOTOOLBOX_LIBRARY AudioToolBox ) add_library(portaudio STATIC IMPORTED GLOBAL) if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)