From 6c36415f5ef5ee1592abcf8e07bf623be9ab2f2c Mon Sep 17 00:00:00 2001 From: torikizi Date: Tue, 31 Oct 2023 21:14:27 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=AB=E8=BF=BD=E5=BE=93=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.py | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/run.py b/run.py index a8746c3..29f7ac6 100644 --- a/run.py +++ b/run.py @@ -388,7 +388,7 @@ def get_webrtc_info(webrtcbuild: bool, source_dir: str, build_dir: str, install_ webrtc_library_dir=os.path.join(webrtc_build_dir, 'obj') if platform.system() == 'Windows' else webrtc_build_dir, clang_dir=os.path.join( webrtc_source_dir, 'src', 'third_party', 'llvm-build', 'Release+Asserts'), - libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'buildtools', 'third_party', 'libc++', 'trunk'),) + libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'third_party', 'libc++', 'src'),) else: return WebrtcInfo( version_file=os.path.join(webrtc_install_dir, 'VERSIONS'), @@ -593,8 +593,8 @@ def install_deps(source_dir, build_dir, install_dir, debug, platform): # LLVM tools_url = webrtc_version['WEBRTC_SRC_TOOLS_URL'] tools_commit = webrtc_version['WEBRTC_SRC_TOOLS_COMMIT'] - libcxx_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_TRUNK_URL'] - libcxx_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_TRUNK_COMMIT'] + libcxx_url = webrtc_version['WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_URL'] + libcxx_commit = webrtc_version['WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_COMMIT'] buildtools_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_URL'] buildtools_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_COMMIT'] install_llvm_args = { @@ -751,18 +751,29 @@ def main(): cmake_args.append(f'-DZAKURO_PLATFORM={args.target}') cmake_args.append(f'-DZAKURO_VERSION={zakuro_version}') cmake_args.append(f'-DZAKURO_COMMIT={zakuro_commit}') - cmake_args.append(f"-DWEBRTC_BUILD_VERSION={webrtc_version['WEBRTC_BUILD_VERSION']}") - cmake_args.append(f"-DWEBRTC_READABLE_VERSION={webrtc_version['WEBRTC_READABLE_VERSION']}") + cmake_args.append( + f"-DWEBRTC_BUILD_VERSION={webrtc_version['WEBRTC_BUILD_VERSION']}") + cmake_args.append( + f"-DWEBRTC_READABLE_VERSION={webrtc_version['WEBRTC_READABLE_VERSION']}") cmake_args.append(f"-DWEBRTC_COMMIT={webrtc_version['WEBRTC_COMMIT']}") - cmake_args.append(f"-DSORA_DIR={cmake_path(os.path.join(install_dir, 'sora'))}") - cmake_args.append(f"-DBOOST_ROOT={cmake_path(os.path.join(install_dir, 'boost'))}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(os.path.join(install_dir, 'lyra'))}") - 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"-DCLI11_ROOT_DIR={cmake_path(os.path.join(install_dir, 'cli11'))}") - cmake_args.append(f"-DBLEND2D_ROOT_DIR={cmake_path(os.path.join(install_dir, 'blend2d'))}") - cmake_args.append(f"-DOPENH264_ROOT_DIR={cmake_path(os.path.join(install_dir, 'openh264'))}") - cmake_args.append(f"-DYAML_ROOT_DIR={cmake_path(os.path.join(install_dir, 'yaml'))}") + cmake_args.append( + f"-DSORA_DIR={cmake_path(os.path.join(install_dir, 'sora'))}") + cmake_args.append( + f"-DBOOST_ROOT={cmake_path(os.path.join(install_dir, 'boost'))}") + cmake_args.append( + f"-DLYRA_DIR={cmake_path(os.path.join(install_dir, 'lyra'))}") + 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"-DCLI11_ROOT_DIR={cmake_path(os.path.join(install_dir, 'cli11'))}") + cmake_args.append( + f"-DBLEND2D_ROOT_DIR={cmake_path(os.path.join(install_dir, 'blend2d'))}") + cmake_args.append( + f"-DOPENH264_ROOT_DIR={cmake_path(os.path.join(install_dir, 'openh264'))}") + cmake_args.append( + f"-DYAML_ROOT_DIR={cmake_path(os.path.join(install_dir, 'yaml'))}") cmake_args += get_common_cmake_args(install_dir, args.target) cmd(['cmake', BASE_DIR, *cmake_args])