From f0d9be8a78d8c5c7a0e4318d1a7b2527a636ea2b Mon Sep 17 00:00:00 2001 From: remi durand Date: Thu, 20 May 2021 11:18:32 +0200 Subject: [PATCH] fix debug builds --- .github/workflows/ccpp_ubuntu_debug.yml | 8 ++++---- .github/workflows/ccpp_win_debug.yml | 4 ++-- deps/wxWidgets/wxWidgets.cmake | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml index 1ca83177e..8fba957bf 100644 --- a/.github/workflows/ccpp_ubuntu_debug.yml +++ b/.github/workflows/ccpp_ubuntu_debug.yml @@ -29,16 +29,16 @@ jobs: run: mkdir deps/build - name: cmake deps working-directory: ./deps/build - run: cmake .. + run: cmake .. -DCMAKE_BUILD_TYPE=Debug - name: make deps working-directory: ./deps/build run: make - - name: rename wxscintilla - working-directory: ./deps/build/destdir/usr/local/lib - run: cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a - name: ls libs working-directory: ./deps/build run: ls ./destdir/usr/local/lib + - name: rename wxscintilla + working-directory: ./deps/build/destdir/usr/local/lib + run: cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a - name: clean deps working-directory: ./deps/build run: rm -rf dep_* diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml index 9e7acc198..9eae585ad 100644 --- a/.github/workflows/ccpp_win_debug.yml +++ b/.github/workflows/ccpp_win_debug.yml @@ -86,11 +86,11 @@ jobs: - name: copy dll working-directory: ./build shell: cmd - run: xcopy /RCYIE src\release\*.dll package\ + run: xcopy /RCYIE src\Debug\*.dll package\ - name: copy exe working-directory: ./build shell: cmd - run: xcopy /RCYIE src\release\*.exe package\ + run: xcopy /RCYIE src\Debug\*.exe package\ - name: copy ms runtime working-directory: ./build shell: cmd diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index bf23698cf..1ba35b494 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -26,7 +26,7 @@ prusaslicer_add_cmake_project(wxWidgets -DwxBUILD_PRECOMP=ON ${_wx_toolkit} "-DCMAKE_DEBUG_POSTFIX:STRING=" - -DwxBUILD_DEBUG_LEVEL=0 + -DwxBUILD_DEBUG_LEVEL=$<$:1>$<$>:0> -DwxUSE_DETECT_SM=OFF -DwxUSE_UNICODE=ON -DwxUSE_OPENGL=ON