File tree Expand file tree Collapse file tree 4 files changed +18
-12
lines changed Expand file tree Collapse file tree 4 files changed +18
-12
lines changed Original file line number Diff line number Diff line change @@ -19,8 +19,8 @@ defaults:
1919
2020env :
2121 SOURCE_DIR : ${{ github.workspace }}
22- # QT_VERSION: 6.5.3
23- QT_VERSION : 6.8.1
22+ QT_VERSION : 6.5.3
23+ # QT_VERSION: 6.8.3
2424 ARTIFACT : " CS3MapEdit-x86_64.AppImage"
2525
2626jobs :
3434 submodules : recursive
3535
3636 - name : Install Qt
37- uses : jurplel/install-qt-action@v3
37+ uses : jurplel/install-qt-action@v4
3838 with :
3939 version : ${{ env.QT_VERSION }}
4040 host : linux
4444 # modules: #qtcharts qt3d
4545 setup-python : false
4646
47+
48+
4749 - name : Create build directory
4850 run : mkdir ${{ env.SOURCE_DIR }}/build
4951
8385 with :
8486 name : ${{ env.ARTIFACT }}
8587 path : ${{ env.SOURCE_DIR }}/build/release
88+ expire_in : 1 week
Original file line number Diff line number Diff line change 44 push :
55 branches :
66 - " master"
7- - " continuous-integration"
7+ # - "continuous-integration"
88 tags :
99 - " v*"
1010 pull_request :
1111 branches :
1212 - " master"
13- - " continuous-integration"
13+ # - "continuous-integration"
1414
1515defaults :
1616 run :
2020 BUILD_TYPE : Release
2121 SOURCE_DIR : ${{ github.workspace }}
2222 # QT_VERSION: 6.5.3
23- QT_VERSION : 6.8 .1
23+ QT_VERSION : 6.7 .1
2424 ARTIFACT : CS3MapEdit_Win64
2525 ARCH : win64_msvc2019_64
2626 HOST : windows
@@ -136,3 +136,4 @@ jobs:
136136 with :
137137 name : ${{ env.ARTIFACT }}
138138 path : ${{ runner.temp }}\build\release
139+ expire_in : 1 week
Original file line number Diff line number Diff line change @@ -111,5 +111,5 @@ contains(DEFINES, USE_SDL_MIXER=1){
111111 SOURCES += shared/implementers/sn_sdl.cpp
112112}
113113
114- QMAKE_CXXFLAGS_RELEASE += -std =c ++17 -O3
115- QMAKE_CXXFLAGS_DEBUG += -std =c ++17 -g3
114+ QMAKE_CXXFLAGS_RELEASE += -std =c ++20 -O3
115+ QMAKE_CXXFLAGS_DEBUG += -std =c ++20 -g3
Original file line number Diff line number Diff line change 1717*/
1818#include " states.h"
1919#include " shared/IFile.h"
20- #include < format>
20+ // #include <format>
2121
2222CStates::CStates ()
2323{
@@ -206,12 +206,14 @@ void CStates::debug()
206206
207207void CStates::getValues (std::vector<StateValuePair> & pairs)
208208{
209+ // C++ 20 not supported yet
210+ // std::format("0x{:02x}", v)
209211 pairs.clear ();
210- // char tmp[16];
212+ char tmp[16 ];
211213 for (const auto &[k, v] : m_stateU)
212214 {
213- // sprintf(tmp, "0x%.2x", v);
214- pairs.push_back ({k, v ? std::format ( " 0x{:02x} " , v) : " " });
215+ sprintf (tmp, " 0x%.2x" , v);
216+ pairs.push_back ({k, v ? tmp : " " });
215217 }
216218
217219 for (const auto &[k, v] : m_stateS)
You can’t perform that action at this time.
0 commit comments