Skip to content

Commit 64f969b

Browse files
committed
test
1 parent f3aabd7 commit 64f969b

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.github/workflows/linux_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ defaults:
1919

2020
env:
2121
SOURCE_DIR: ${{ github.workspace }}
22-
#QT_VERSION: 6.5.3
23-
QT_VERSION: 6.8.3
22+
QT_VERSION: 6.5.3
23+
#QT_VERSION: 6.8.3
2424
ARTIFACT: "CS3MapEdit-x86_64.AppImage"
2525

2626
jobs:
2727
build:
28-
runs-on: ubuntu-24.04
28+
runs-on: ubuntu-22.04
2929

3030
steps:
3131
- name: Checkout repo

.github/workflows/windows_release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,3 +136,4 @@ jobs:
136136
with:
137137
name: ${{ env.ARTIFACT }}
138138
path: ${{ runner.temp }}\build\release
139+
expire_in: 1 week

src/mapedit.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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

src/states.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
#include "states.h"
1919
#include "shared/IFile.h"
20-
#include <format>
20+
//#include <format>
2121

2222
CStates::CStates()
2323
{
@@ -206,12 +206,14 @@ void CStates::debug()
206206

207207
void 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)

0 commit comments

Comments
 (0)