Skip to content

Commit 0d41eeb

Browse files
xengine-qytxengine-qyt
committed
modify:reset vs c++ version build
1 parent 6321e02 commit 0d41eeb

5 files changed

Lines changed: 37 additions & 52 deletions

File tree

‎XEngine_Module/XEngine_AIApi/XEngine_AIApi.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<ConformanceMode>true</ConformanceMode>
130130
<PrecompiledHeader>Use</PrecompiledHeader>
131131
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
132+
<LanguageStandard>Default</LanguageStandard>
132133
</ClCompile>
133134
<Link>
134135
<SubSystem>Windows</SubSystem>

‎XEngine_Module/XEngine_InfoReport/XEngine_InfoReport.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@
129129
<ConformanceMode>true</ConformanceMode>
130130
<PrecompiledHeader>Use</PrecompiledHeader>
131131
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
132-
<LanguageStandard>stdcpp20</LanguageStandard>
133-
<LanguageStandard_C>stdc17</LanguageStandard_C>
132+
<LanguageStandard>Default</LanguageStandard>
133+
<LanguageStandard_C>Default</LanguageStandard_C>
134134
</ClCompile>
135135
<Link>
136136
<SubSystem>Windows</SubSystem>
@@ -150,8 +150,8 @@
150150
<ConformanceMode>true</ConformanceMode>
151151
<PrecompiledHeader>Use</PrecompiledHeader>
152152
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
153-
<LanguageStandard>stdcpp20</LanguageStandard>
154-
<LanguageStandard_C>stdc17</LanguageStandard_C>
153+
<LanguageStandard>Default</LanguageStandard>
154+
<LanguageStandard_C>Default</LanguageStandard_C>
155155
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
156156
</ClCompile>
157157
<Link>
@@ -172,8 +172,8 @@
172172
<ConformanceMode>true</ConformanceMode>
173173
<PrecompiledHeader>Use</PrecompiledHeader>
174174
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
175-
<LanguageStandard>stdcpp20</LanguageStandard>
176-
<LanguageStandard_C>stdc17</LanguageStandard_C>
175+
<LanguageStandard>Default</LanguageStandard>
176+
<LanguageStandard_C>Default</LanguageStandard_C>
177177
</ClCompile>
178178
<Link>
179179
<SubSystem>Windows</SubSystem>
@@ -191,8 +191,8 @@
191191
<ConformanceMode>true</ConformanceMode>
192192
<PrecompiledHeader>Use</PrecompiledHeader>
193193
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
194-
<LanguageStandard>stdcpp20</LanguageStandard>
195-
<LanguageStandard_C>stdc17</LanguageStandard_C>
194+
<LanguageStandard>Default</LanguageStandard>
195+
<LanguageStandard_C>Default</LanguageStandard_C>
196196
</ClCompile>
197197
<Link>
198198
<SubSystem>Windows</SubSystem>
@@ -212,8 +212,8 @@
212212
<ConformanceMode>true</ConformanceMode>
213213
<PrecompiledHeader>Use</PrecompiledHeader>
214214
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
215-
<LanguageStandard>stdcpp20</LanguageStandard>
216-
<LanguageStandard_C>stdc17</LanguageStandard_C>
215+
<LanguageStandard>Default</LanguageStandard>
216+
<LanguageStandard_C>Default</LanguageStandard_C>
217217
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
218218
</ClCompile>
219219
<Link>
@@ -236,8 +236,8 @@
236236
<ConformanceMode>true</ConformanceMode>
237237
<PrecompiledHeader>Use</PrecompiledHeader>
238238
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
239-
<LanguageStandard>stdcpp20</LanguageStandard>
240-
<LanguageStandard_C>stdc17</LanguageStandard_C>
239+
<LanguageStandard>Default</LanguageStandard>
240+
<LanguageStandard_C>Default</LanguageStandard_C>
241241
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
242242
</ClCompile>
243243
<Link>

‎XEngine_Module/XEngine_Verification/Verification_XAuth/Verification_XAuthKey.cpp‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_FileRead(VERIFICATION_XAUTHKE
7171
else
7272
{
7373
//解密
74-
#if XENGINE_VERSION_KERNEL >= 9 && XENGINE_VERSION_MAIN >= 32
7574
if (!Cryption_XCrypto_Decoder((LPCXBTR)tszENCodecBuffer, &nRet, (XBYTE *)tszDECodecBuffer, lpszKeyPass))
76-
#else
77-
if (!Cryption_XCrypto_Decoder(tszENCodecBuffer, &nRet, tszDECodecBuffer, lpszKeyPass))
78-
#endif
7975
{
8076
Verification_IsErrorOccur = true;
8177
Verification_dwErrorCode = Cryption_GetLastError();
@@ -170,11 +166,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_FileWrite(VERIFICATION_XAUTHK
170166
}
171167
else
172168
{
173-
#if XENGINE_VERSION_KERNEL >= 9 && XENGINE_VERSION_MAIN >= 32
174169
if (!Cryption_XCrypto_Encoder((LPCXBTR)tszDECodecBuffer, &nSize, (XBYTE *)tszENCodecBuffer, lpszKeyPass))
175-
#else
176-
if (!Cryption_XCrypto_Encoder(tszDECodecBuffer, &nSize, (XBYTE*)tszENCodecBuffer, lpszKeyPass))
177-
#endif
178170
{
179171
Verification_IsErrorOccur = true;
180172
Verification_dwErrorCode = Cryption_GetLastError();
@@ -208,11 +200,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_MemoryRead(VERIFICATION_XAUTH
208200
else
209201
{
210202
//解密
211-
#if XENGINE_VERSION_KERNEL >= 9 && XENGINE_VERSION_MAIN >= 32
212203
if (!Cryption_XCrypto_Decoder((LPCXBTR)tszENCodecBuffer, &nRet, (XBYTE *)tszDECodecBuffer, lpszKeyPass))
213-
#else
214-
if (!Cryption_XCrypto_Decoder(tszENCodecBuffer, &nRet, tszDECodecBuffer, lpszKeyPass))
215-
#endif
216204
{
217205
Verification_IsErrorOccur = true;
218206
Verification_dwErrorCode = Cryption_GetLastError();
@@ -274,11 +262,7 @@ bool CVerification_XAuthKey::Verification_XAuthKey_MemoryWrite(VERIFICATION_XAUT
274262
}
275263
else
276264
{
277-
#if XENGINE_VERSION_KERNEL >= 9 && XENGINE_VERSION_MAIN >= 32
278265
if (!Cryption_XCrypto_Encoder((LPCXBTR)tszDECodecBuffer, &nSize, (XBYTE *)ptszMSGBuffer, lpszKeyPass))
279-
#else
280-
if (!Cryption_XCrypto_Encoder(tszDECodecBuffer, &nSize, (XBYTE *)ptszMSGBuffer, lpszKeyPass))
281-
#endif
282266
{
283267
Verification_IsErrorOccur = true;
284268
Verification_dwErrorCode = Cryption_GetLastError();

‎XEngine_Module/jsoncpp/jsoncpp.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@
129129
<ConformanceMode>true</ConformanceMode>
130130
<PrecompiledHeader>NotUsing</PrecompiledHeader>
131131
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
132-
<LanguageStandard>stdcpp20</LanguageStandard>
133-
<LanguageStandard_C>stdc17</LanguageStandard_C>
132+
<LanguageStandard>Default</LanguageStandard>
133+
<LanguageStandard_C>Default</LanguageStandard_C>
134134
</ClCompile>
135135
<Link>
136136
<SubSystem>Windows</SubSystem>
@@ -148,8 +148,8 @@
148148
<ConformanceMode>true</ConformanceMode>
149149
<PrecompiledHeader>NotUsing</PrecompiledHeader>
150150
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
151-
<LanguageStandard>stdcpp20</LanguageStandard>
152-
<LanguageStandard_C>stdc17</LanguageStandard_C>
151+
<LanguageStandard>Default</LanguageStandard>
152+
<LanguageStandard_C>Default</LanguageStandard_C>
153153
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
154154
</ClCompile>
155155
<Link>
@@ -168,8 +168,8 @@
168168
<ConformanceMode>true</ConformanceMode>
169169
<PrecompiledHeader>NotUsing</PrecompiledHeader>
170170
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
171-
<LanguageStandard>stdcpp20</LanguageStandard>
172-
<LanguageStandard_C>stdc17</LanguageStandard_C>
171+
<LanguageStandard>Default</LanguageStandard>
172+
<LanguageStandard_C>Default</LanguageStandard_C>
173173
</ClCompile>
174174
<Link>
175175
<SubSystem>Windows</SubSystem>
@@ -185,8 +185,8 @@
185185
<ConformanceMode>true</ConformanceMode>
186186
<PrecompiledHeader>NotUsing</PrecompiledHeader>
187187
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
188-
<LanguageStandard>stdcpp20</LanguageStandard>
189-
<LanguageStandard_C>stdc17</LanguageStandard_C>
188+
<LanguageStandard>Default</LanguageStandard>
189+
<LanguageStandard_C>Default</LanguageStandard_C>
190190
</ClCompile>
191191
<Link>
192192
<SubSystem>Windows</SubSystem>
@@ -204,8 +204,8 @@
204204
<ConformanceMode>true</ConformanceMode>
205205
<PrecompiledHeader>NotUsing</PrecompiledHeader>
206206
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
207-
<LanguageStandard>stdcpp20</LanguageStandard>
208-
<LanguageStandard_C>stdc17</LanguageStandard_C>
207+
<LanguageStandard>Default</LanguageStandard>
208+
<LanguageStandard_C>Default</LanguageStandard_C>
209209
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
210210
</ClCompile>
211211
<Link>
@@ -226,8 +226,8 @@
226226
<ConformanceMode>true</ConformanceMode>
227227
<PrecompiledHeader>NotUsing</PrecompiledHeader>
228228
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
229-
<LanguageStandard>stdcpp20</LanguageStandard>
230-
<LanguageStandard_C>stdc17</LanguageStandard_C>
229+
<LanguageStandard>Default</LanguageStandard>
230+
<LanguageStandard_C>Default</LanguageStandard_C>
231231
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
232232
</ClCompile>
233233
<Link>

‎XEngine_Module/tinyxml2/tinyxml2.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
<ConformanceMode>true</ConformanceMode>
106106
<PrecompiledHeader>Use</PrecompiledHeader>
107107
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
108-
<LanguageStandard>stdcpp20</LanguageStandard>
109-
<LanguageStandard_C>stdc17</LanguageStandard_C>
108+
<LanguageStandard>Default</LanguageStandard>
109+
<LanguageStandard_C>Default</LanguageStandard_C>
110110
</ClCompile>
111111
<Link>
112112
<SubSystem>Windows</SubSystem>
@@ -124,8 +124,8 @@
124124
<ConformanceMode>true</ConformanceMode>
125125
<PrecompiledHeader>Use</PrecompiledHeader>
126126
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
127-
<LanguageStandard>stdcpp20</LanguageStandard>
128-
<LanguageStandard_C>stdc17</LanguageStandard_C>
127+
<LanguageStandard>Default</LanguageStandard>
128+
<LanguageStandard_C>Default</LanguageStandard_C>
129129
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
130130
</ClCompile>
131131
<Link>
@@ -144,8 +144,8 @@
144144
<ConformanceMode>true</ConformanceMode>
145145
<PrecompiledHeader>Use</PrecompiledHeader>
146146
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
147-
<LanguageStandard>stdcpp20</LanguageStandard>
148-
<LanguageStandard_C>stdc17</LanguageStandard_C>
147+
<LanguageStandard>Default</LanguageStandard>
148+
<LanguageStandard_C>Default</LanguageStandard_C>
149149
</ClCompile>
150150
<Link>
151151
<SubSystem>Windows</SubSystem>
@@ -161,8 +161,8 @@
161161
<ConformanceMode>true</ConformanceMode>
162162
<PrecompiledHeader>Use</PrecompiledHeader>
163163
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
164-
<LanguageStandard>stdcpp20</LanguageStandard>
165-
<LanguageStandard_C>stdc17</LanguageStandard_C>
164+
<LanguageStandard>Default</LanguageStandard>
165+
<LanguageStandard_C>Default</LanguageStandard_C>
166166
</ClCompile>
167167
<Link>
168168
<SubSystem>Windows</SubSystem>
@@ -180,8 +180,8 @@
180180
<ConformanceMode>true</ConformanceMode>
181181
<PrecompiledHeader>Use</PrecompiledHeader>
182182
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
183-
<LanguageStandard>stdcpp20</LanguageStandard>
184-
<LanguageStandard_C>stdc17</LanguageStandard_C>
183+
<LanguageStandard>Default</LanguageStandard>
184+
<LanguageStandard_C>Default</LanguageStandard_C>
185185
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
186186
</ClCompile>
187187
<Link>
@@ -202,8 +202,8 @@
202202
<ConformanceMode>true</ConformanceMode>
203203
<PrecompiledHeader>Use</PrecompiledHeader>
204204
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
205-
<LanguageStandard>stdcpp20</LanguageStandard>
206-
<LanguageStandard_C>stdc17</LanguageStandard_C>
205+
<LanguageStandard>Default</LanguageStandard>
206+
<LanguageStandard_C>Default</LanguageStandard_C>
207207
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
208208
</ClCompile>
209209
<Link>

0 commit comments

Comments
 (0)