From a982d5420290fd495edc96810cdc58072763dea4 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Thu, 17 Feb 2022 11:13:07 +0100 Subject: [PATCH 1/4] add debug build to windows github actions --- .github/workflows/cmake-windows.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 9ea76a7..aa9b43b 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -44,4 +44,15 @@ jobs: name: BeamMP-Server.exe path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe + - name: Build debug + working-directory: ${{github.workspace}}/build-windows + shell: bash + run: | + cmake --build . --config Debug + + - name: Archive debug artifacts + uses: actions/upload-artifact@v2 + with: + name: BeamMP-Server-debug.exe + path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe From 86ad28abdccef3626534f2be880aab996ae3d758 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Thu, 17 Feb 2022 11:29:51 +0100 Subject: [PATCH 2/4] Microsoft (R) Windows (TM) needs deprecation --- .github/workflows/cmake-windows.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index aa9b43b..e18328c 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -44,6 +44,13 @@ jobs: name: BeamMP-Server.exe path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe + - name: Configure CMake for debug + shell: bash + working-directory: ${{github.workspace}}/build-windows + env: + beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }} + run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url" -DCMAKE_CXX_FLAGS="/bigobj" + - name: Build debug working-directory: ${{github.workspace}}/build-windows shell: bash From 687b4e4235d66d6a1eea602b152ca8699fafa614 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Thu, 17 Feb 2022 11:42:37 +0100 Subject: [PATCH 3/4] add bigobj flag --- .github/workflows/cmake-windows.yml | 7 ------- CMakeLists.txt | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index e18328c..aa9b43b 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -44,13 +44,6 @@ jobs: name: BeamMP-Server.exe path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe - - name: Configure CMake for debug - shell: bash - working-directory: ${{github.workspace}}/build-windows - env: - beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }} - run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url" -DCMAKE_CXX_FLAGS="/bigobj" - - name: Build debug working-directory: ${{github.workspace}}/build-windows shell: bash diff --git a/CMakeLists.txt b/CMakeLists.txt index a2bdb67..27ba001 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,10 @@ endif() set(SENTRY_BACKEND breakpad) add_subdirectory("deps/sentry-native") +if (MSVC) + add_definitions(/bigobj) +endif () + message(STATUS "Setting compiler flags") if (WIN32) From 8ce3be03a349e4c1c6d81acfe4fcba9c16453fb1 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Thu, 17 Feb 2022 12:00:03 +0100 Subject: [PATCH 4/4] make bigobj a linker flag? --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27ba001..6cbe134 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ set(SENTRY_BACKEND breakpad) add_subdirectory("deps/sentry-native") if (MSVC) - add_definitions(/bigobj) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /bigobj") endif () message(STATUS "Setting compiler flags")