From 9f8b239e12268728b4ca7fbe89caa6608df1d807 Mon Sep 17 00:00:00 2001 From: tnoho Date: Tue, 10 Sep 2024 00:40:18 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=92=E9=80=9A=E3=81=9B=E3=81=AA=E3=81=8F?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/run.py b/run.py index 83f80716..fa0e7ede 100644 --- a/run.py +++ b/run.py @@ -17,6 +17,7 @@ cmd, cmdcap, get_macos_osver, + get_sora_info, get_webrtc_info, get_webrtc_platform, get_windows_osver, @@ -218,14 +219,18 @@ def main(): webrtc_info = get_webrtc_info( webrtc_platform, args.local_webrtc_build_dir, install_dir, args.debug ) + + sora_info = get_sora_info( + webrtc_platform, args.local_sora_cpp_sdk_dir, install_dir, args.debug + ) cmake_args = [] cmake_args.append(f"-DCMAKE_BUILD_TYPE={configuration}") cmake_args.append(f"-DTARGET_OS={platform.target.os}") - cmake_args.append(f"-DBOOST_ROOT={cmake_path(os.path.join(install_dir, 'boost'))}") + cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") - cmake_args.append(f"-DSORA_DIR={cmake_path(os.path.join(install_dir, 'sora'))}") + cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") cmake_args.append(f"-DOPENH264_DIR={cmake_path(os.path.join(install_dir, 'openh264'))}") python_version = get_python_version() cmake_args.append(f"-DPYTHON_VERSION_STRING={python_version}")