Skip to content

Commit debde6f

Browse files
xengine-qytxengine-qyt
committed
update:compiler version to c++20 and c17
1 parent 7f5101a commit debde6f

File tree

13 files changed

+57
-7
lines changed

13 files changed

+57
-7
lines changed

‎.github/workflows/macbuild.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ jobs:
8484
cd XEngine_Release
8585
sudo launchctl limit core unlimited
8686
sudo sysctl -w kern.corefile=coredump
87+
set +e
8788
./XEngine_StreamMediaApp -t
8889
ls -al
8990
lldb ./XEngine_StreamMediaApp ./coredump
90-
continue-on-error: true
91+
set -e
9192
9293
- name: Upload folder as artifact with mac x64
9394
if: matrix.os == 'macos-13'

‎XEngine_Source/XEngine_ModuleConfigure/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
PLATDIR =

‎XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@
9898
<PrecompiledHeader>Use</PrecompiledHeader>
9999
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
100100
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
101+
<LanguageStandard>stdcpp20</LanguageStandard>
102+
<LanguageStandard_C>stdc17</LanguageStandard_C>
101103
</ClCompile>
102104
<Link>
103105
<SubSystem>Windows</SubSystem>
@@ -119,6 +121,8 @@
119121
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
120122
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
121123
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
124+
<LanguageStandard>stdcpp20</LanguageStandard>
125+
<LanguageStandard_C>stdc17</LanguageStandard_C>
122126
</ClCompile>
123127
<Link>
124128
<SubSystem>Windows</SubSystem>
@@ -138,6 +142,8 @@
138142
<PrecompiledHeader>Use</PrecompiledHeader>
139143
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
140144
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
145+
<LanguageStandard>stdcpp20</LanguageStandard>
146+
<LanguageStandard_C>stdc17</LanguageStandard_C>
141147
</ClCompile>
142148
<Link>
143149
<SubSystem>Windows</SubSystem>
@@ -159,6 +165,8 @@
159165
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
160166
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
161167
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
168+
<LanguageStandard>stdcpp20</LanguageStandard>
169+
<LanguageStandard_C>stdc17</LanguageStandard_C>
162170
</ClCompile>
163171
<Link>
164172
<SubSystem>Windows</SubSystem>

‎XEngine_Source/XEngine_ModuleHelp/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
PLATDIR =

‎XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@
104104
<ConformanceMode>true</ConformanceMode>
105105
<PrecompiledHeader>Use</PrecompiledHeader>
106106
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
107+
<LanguageStandard>stdcpp20</LanguageStandard>
108+
<LanguageStandard_C>stdc17</LanguageStandard_C>
107109
</ClCompile>
108110
<Link>
109111
<SubSystem>Windows</SubSystem>
@@ -124,6 +126,8 @@
124126
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
125127
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
126128
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
129+
<LanguageStandard>stdcpp20</LanguageStandard>
130+
<LanguageStandard_C>stdc17</LanguageStandard_C>
127131
</ClCompile>
128132
<Link>
129133
<SubSystem>Windows</SubSystem>
@@ -142,6 +146,8 @@
142146
<ConformanceMode>true</ConformanceMode>
143147
<PrecompiledHeader>Use</PrecompiledHeader>
144148
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
149+
<LanguageStandard>stdcpp20</LanguageStandard>
150+
<LanguageStandard_C>stdc17</LanguageStandard_C>
145151
</ClCompile>
146152
<Link>
147153
<SubSystem>Windows</SubSystem>
@@ -161,6 +167,8 @@
161167
<PrecompiledHeader>Use</PrecompiledHeader>
162168
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
163169
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
170+
<LanguageStandard>stdcpp20</LanguageStandard>
171+
<LanguageStandard_C>stdc17</LanguageStandard_C>
164172
</ClCompile>
165173
<Link>
166174
<SubSystem>Windows</SubSystem>

‎XEngine_Source/XEngine_ModuleProtocol/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
PLATDIR =

‎XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@
9898
<ConformanceMode>true</ConformanceMode>
9999
<PrecompiledHeader>Use</PrecompiledHeader>
100100
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
101+
<LanguageStandard>stdcpp20</LanguageStandard>
102+
<LanguageStandard_C>stdc17</LanguageStandard_C>
101103
</ClCompile>
102104
<Link>
103105
<SubSystem>Windows</SubSystem>
@@ -117,6 +119,8 @@
117119
<PrecompiledHeader>Use</PrecompiledHeader>
118120
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
119121
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
122+
<LanguageStandard>stdcpp20</LanguageStandard>
123+
<LanguageStandard_C>stdc17</LanguageStandard_C>
120124
</ClCompile>
121125
<Link>
122126
<SubSystem>Windows</SubSystem>
@@ -135,6 +139,8 @@
135139
<ConformanceMode>true</ConformanceMode>
136140
<PrecompiledHeader>Use</PrecompiledHeader>
137141
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
142+
<LanguageStandard>stdcpp20</LanguageStandard>
143+
<LanguageStandard_C>stdc17</LanguageStandard_C>
138144
</ClCompile>
139145
<Link>
140146
<SubSystem>Windows</SubSystem>
@@ -154,6 +160,8 @@
154160
<PrecompiledHeader>Use</PrecompiledHeader>
155161
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
156162
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
163+
<LanguageStandard>stdcpp20</LanguageStandard>
164+
<LanguageStandard_C>stdc17</LanguageStandard_C>
157165
</ClCompile>
158166
<Link>
159167
<SubSystem>Windows</SubSystem>

‎XEngine_Source/XEngine_ModuleQueue/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
PLATDIR =

‎XEngine_Source/XEngine_ModuleQueue/XEngine_ModuleQueue.vcxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
<ConformanceMode>true</ConformanceMode>
9191
<PrecompiledHeader>Use</PrecompiledHeader>
9292
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
93+
<LanguageStandard>stdcpp20</LanguageStandard>
94+
<LanguageStandard_C>stdc17</LanguageStandard_C>
9395
</ClCompile>
9496
<Link>
9597
<SubSystem>Windows</SubSystem>
@@ -109,6 +111,8 @@
109111
<PrecompiledHeader>Use</PrecompiledHeader>
110112
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
111113
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
114+
<LanguageStandard>stdcpp20</LanguageStandard>
115+
<LanguageStandard_C>stdc17</LanguageStandard_C>
112116
</ClCompile>
113117
<Link>
114118
<SubSystem>Windows</SubSystem>
@@ -127,6 +131,8 @@
127131
<ConformanceMode>true</ConformanceMode>
128132
<PrecompiledHeader>Use</PrecompiledHeader>
129133
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
134+
<LanguageStandard>stdcpp20</LanguageStandard>
135+
<LanguageStandard_C>stdc17</LanguageStandard_C>
130136
</ClCompile>
131137
<Link>
132138
<SubSystem>Windows</SubSystem>
@@ -146,6 +152,8 @@
146152
<PrecompiledHeader>Use</PrecompiledHeader>
147153
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
148154
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
155+
<LanguageStandard>stdcpp20</LanguageStandard>
156+
<LanguageStandard_C>stdc17</LanguageStandard_C>
149157
</ClCompile>
150158
<Link>
151159
<SubSystem>Windows</SubSystem>

‎XEngine_Source/XEngine_ModuleSession/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
PLATDIR =

0 commit comments

Comments
 (0)