From f315a739058f5b182384bc6ad5d958eeb89087a0 Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 14 Oct 2025 15:44:49 -0400 Subject: [PATCH] refactor(ci): update Protobuf configuration in workflows - Modified CI and release workflows to use static linking for Protobuf by adding flags for static libraries and MSVC static runtime. - Ensured consistent C and C++ flags across both workflows to improve compatibility and reduce potential issues. Benefits: - Enhances build stability and performance by leveraging static linking for Protobuf, leading to a more reliable CI process. --- .github/workflows/ci.yml | 5 ++++- .github/workflows/release.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8026befb..b714d0ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -421,7 +421,10 @@ jobs: -DVCPKG_MANIFEST_MODE=ON ` -DVCPKG_INSTALL_OPTIONS="--debug" ` -DOPENSSL_NO_ASM=ON ` - -DCMAKE_CXX_FLAGS="/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H" ` + -DCMAKE_CXX_FLAGS="/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H /DPROTOBUF_USE_DLLS=0" ` + -DCMAKE_C_FLAGS="/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H /DPROTOBUF_USE_DLLS=0" ` + -DProtobuf_USE_STATIC_LIBS=ON ` + -DProtobuf_MSVC_STATIC_RUNTIME=ON ` -DYAZE_BUILD_TESTS=ON ` -DYAZE_BUILD_EMU=ON ` -DYAZE_ENABLE_ROM_TESTS=OFF ` diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1cf389b6..e899b647 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -430,7 +430,10 @@ jobs: -DVCPKG_TARGET_TRIPLET=x64-windows-static ` -DVCPKG_MANIFEST_MODE=ON ` -DOPENSSL_NO_ASM=ON ` - -DCMAKE_CXX_FLAGS="/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H" ` + -DCMAKE_CXX_FLAGS="/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H /DPROTOBUF_USE_DLLS=0" ` + -DCMAKE_C_FLAGS="/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H /DPROTOBUF_USE_DLLS=0" ` + -DProtobuf_USE_STATIC_LIBS=ON ` + -DProtobuf_MSVC_STATIC_RUNTIME=ON ` -DYAZE_BUILD_TESTS=ON ` -DYAZE_BUILD_EMU=ON ` -DYAZE_BUILD_Z3ED=ON `