Skip to content

Commit 6128820

Browse files
ec-ec-
committed
win32: improved forward compatibility for msvc2017 project files
misc: fixed compiler warnings
1 parent b6b0601 commit 6128820

15 files changed

Lines changed: 168 additions & 112 deletions

‎code/botlib/be_aas_file.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static void AAS_SwapAASData(void)
177177
#define CHECK_RANGE(first, count, limit) \
178178
((uint64_t)(unsigned)(first) + (unsigned)(count) > (limit))
179179

180-
#define UABS(c) (((c) & 0x80000000) ? -(unsigned)c : (unsigned)c)
180+
#define UABS(c) (((c) & 0x80000000) ? (unsigned)-(c) : (unsigned)(c))
181181

182182
static const char *AAS_ValidateAASData(void)
183183
{

‎code/client/client.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ typedef struct {
5151

5252
int messageNum; // copied from netchan->incoming_sequence
5353
int deltaNum; // messageNum the delta is from
54-
int ping; // time from when cmdNum-1 was sent to time packet was reeceived
54+
int ping; // time from when cmdNum-1 was sent to time packet was received
5555
int areabytes;
5656
byte areamask[MAX_MAP_AREA_BYTES]; // portalarea visibility bits
5757

‎code/qcommon/cm_patch.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ CM_AddFacetBevels
840840
static void CM_AddFacetBevels( facet_t *facet ) {
841841

842842
int i, j, k, l;
843-
int axis, dir, order, flipped;
843+
int axis, dir, flipped;
844844
float plane[4], newplane[4];
845845
winding_t *w, *w2;
846846
vec3_t mins, maxs, vec, vec2;
@@ -867,10 +867,9 @@ static void CM_AddFacetBevels( facet_t *facet ) {
867867
WindingBounds(w, mins, maxs);
868868

869869
// add the axial planes
870-
order = 0;
871870
for ( axis = 0 ; axis < 3 ; axis++ )
872871
{
873-
for ( dir = -1 ; dir <= 1 ; dir += 2, order++ )
872+
for ( dir = -1 ; dir <= 1 ; dir += 2 )
874873
{
875874
VectorClear(plane);
876875
plane[axis] = dir;

‎code/qcommon/vm_x86.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,6 +2571,7 @@ VM_FindMOps
25712571
Search for known macro-op sequences
25722572
=================
25732573
*/
2574+
#ifdef MACRO_OPTIMIZE
25742575
static void VM_FindMOps( instruction_t *buf, int instructionCount )
25752576
{
25762577
instruction_t *i;
@@ -2581,7 +2582,6 @@ static void VM_FindMOps( instruction_t *buf, int instructionCount )
25812582

25822583
while ( n < instructionCount )
25832584
{
2584-
#ifdef MACRO_OPTIMIZE
25852585
if ( i->op == OP_LOCAL || i->op == OP_CONST ) {
25862586
// OP_LOCAL|OP_CONST + OP_LOCAL|OP_CONST + OP_LOAD4 + OP_CONST + OP_XXX + OP_STORE4
25872587
if ( (i + 1)->op == i->op && i->value == (i + 1)->value && (i + 2)->op == OP_LOAD4 && (i + 3)->op == OP_CONST && (i + 4)->op != OP_UNDEF && (i + 5)->op == OP_STORE4
@@ -2615,12 +2615,12 @@ static void VM_FindMOps( instruction_t *buf, int instructionCount )
26152615
}
26162616
}
26172617
}
2618-
#endif
26192618

26202619
i++;
26212620
n++;
26222621
}
26232622
}
2623+
#endif // MACRO_OPTIMIZE
26242624

26252625

26262626
#ifdef MACRO_OPTIMIZE
@@ -2760,7 +2760,9 @@ qboolean VM_Compile( vm_t *vm, vmHeader_t *header ) {
27602760

27612761
VM_ReplaceInstructions( vm, inst );
27622762

2763+
#ifdef MACRO_OPTIMIZE
27632764
VM_FindMOps( inst, vm->instructionCount );
2765+
#endif
27642766

27652767
#if JUMP_OPTIMIZE
27662768
for ( i = 0; i < header->instructionCount; i++ ) {

‎code/renderer/tr_shade_calc.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ void RB_CalcSpecularAlpha( unsigned char *alphas ) {
12331233
static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
12341234
{
12351235
int i, j;
1236-
float *v, *normal;
1236+
float *normal;
12371237
float incoming;
12381238
const trRefEntity_t *ent;
12391239
int ambientLightInt;
@@ -1247,11 +1247,10 @@ static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
12471247
VectorCopy( ent->directedLight, directedLight );
12481248
VectorCopy( ent->lightDir, lightDir );
12491249

1250-
v = tess.xyz[0];
12511250
normal = tess.normal[0];
12521251

12531252
numVertexes = tess.numVertexes;
1254-
for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
1253+
for (i = 0 ; i < numVertexes ; i++, normal += 4) {
12551254
incoming = DotProduct (normal, lightDir);
12561255
if ( incoming <= 0 ) {
12571256
*(int *)&colors[i*4] = ambientLightInt;

‎code/renderervk/tr_shade_calc.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ void RB_CalcSpecularAlpha( unsigned char *alphas ) {
12331233
static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
12341234
{
12351235
int i, j;
1236-
float *v, *normal;
1236+
float *normal;
12371237
float incoming;
12381238
const trRefEntity_t *ent;
12391239
int ambientLightInt;
@@ -1247,11 +1247,10 @@ static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
12471247
VectorCopy( ent->directedLight, directedLight );
12481248
VectorCopy( ent->lightDir, lightDir );
12491249

1250-
v = tess.xyz[0];
12511250
normal = tess.normal[0];
12521251

12531252
numVertexes = tess.numVertexes;
1254-
for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
1253+
for (i = 0 ; i < numVertexes ; i++, normal += 4) {
12551254
incoming = DotProduct (normal, lightDir);
12561255
if ( incoming <= 0 ) {
12571256
*(int *)&colors[i*4] = ambientLightInt;

‎code/win32/msvc2017/botlib.vcxproj‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,38 @@
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
3030
<ProjectGuid>{A410161F-AE9F-485D-A01F-5294891430A6}</ProjectGuid>
31-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
31+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.19041.0</WindowsTargetPlatformVersion>
32+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' &gt;= '16'">10.0</WindowsTargetPlatformVersion>
3233
</PropertyGroup>
3334
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3536
<ConfigurationType>StaticLibrary</ConfigurationType>
36-
<PlatformToolset>v141_xp</PlatformToolset>
37+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
38+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
3739
</PropertyGroup>
3840
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3941
<ConfigurationType>StaticLibrary</ConfigurationType>
40-
<PlatformToolset>v141_xp</PlatformToolset>
42+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
43+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4144
</PropertyGroup>
4245
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4346
<ConfigurationType>StaticLibrary</ConfigurationType>
44-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
48+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4549
</PropertyGroup>
4650
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
4751
<ConfigurationType>StaticLibrary</ConfigurationType>
48-
<PlatformToolset>v141</PlatformToolset>
52+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
53+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4954
</PropertyGroup>
5055
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5156
<ConfigurationType>StaticLibrary</ConfigurationType>
52-
<PlatformToolset>v141</PlatformToolset>
57+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
58+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5359
</PropertyGroup>
5460
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
55-
<PlatformToolset>v141</PlatformToolset>
61+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
62+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5663
<ConfigurationType>StaticLibrary</ConfigurationType>
5764
</PropertyGroup>
5865
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎code/win32/msvc2017/libjpeg.vcxproj‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,39 @@
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
3030
<ProjectGuid>{17867AF4-12CB-4847-A13E-BF37D8BDF597}</ProjectGuid>
31-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
31+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.19041.0</WindowsTargetPlatformVersion>
32+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' &gt;= '16'">10.0</WindowsTargetPlatformVersion>
3233
</PropertyGroup>
3334
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3536
<ConfigurationType>StaticLibrary</ConfigurationType>
36-
<PlatformToolset>v141_xp</PlatformToolset>
37+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
38+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
3739
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3941
<ConfigurationType>StaticLibrary</ConfigurationType>
40-
<PlatformToolset>v141_xp</PlatformToolset>
42+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
43+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4144
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4346
<ConfigurationType>StaticLibrary</ConfigurationType>
44-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
48+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4549
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
50+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
4751
<ConfigurationType>StaticLibrary</ConfigurationType>
48-
<PlatformToolset>v141</PlatformToolset>
52+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
53+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4954
</PropertyGroup>
50-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
55+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5156
<ConfigurationType>StaticLibrary</ConfigurationType>
52-
<PlatformToolset>v141</PlatformToolset>
57+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
58+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5359
</PropertyGroup>
54-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
61+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
62+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5563
<ConfigurationType>StaticLibrary</ConfigurationType>
56-
<PlatformToolset>v141</PlatformToolset>
5764
</PropertyGroup>
5865
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5966
<ImportGroup Label="ExtensionSettings">

‎code/win32/msvc2017/libogg.vcxproj‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,42 @@
3030
<VCProjectVersion>15.0</VCProjectVersion>
3131
<ProjectGuid>{BDE64406-A909-432E-A45A-DE8ACF334E28}</ProjectGuid>
3232
<RootNamespace>libogg</RootNamespace>
33-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
33+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.19041.0</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' &gt;= '16'">10.0</WindowsTargetPlatformVersion>
3435
</PropertyGroup>
3536
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
36-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
37+
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3739
<ConfigurationType>StaticLibrary</ConfigurationType>
38-
<PlatformToolset>v141_xp</PlatformToolset>
40+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
41+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
3942
</PropertyGroup>
40-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4144
<ConfigurationType>StaticLibrary</ConfigurationType>
42-
<PlatformToolset>v141_xp</PlatformToolset>
45+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
46+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4347
</PropertyGroup>
44-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4549
<ConfigurationType>StaticLibrary</ConfigurationType>
46-
<PlatformToolset>v141</PlatformToolset>
50+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
51+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4752
</PropertyGroup>
48-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
53+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
4954
<ConfigurationType>StaticLibrary</ConfigurationType>
50-
<PlatformToolset>v141</PlatformToolset>
55+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
56+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5157
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5359
<ConfigurationType>StaticLibrary</ConfigurationType>
54-
<PlatformToolset>v141</PlatformToolset>
60+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
61+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5562
</PropertyGroup>
56-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
63+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
64+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
65+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5766
<ConfigurationType>StaticLibrary</ConfigurationType>
58-
<PlatformToolset>v141</PlatformToolset>
5967
</PropertyGroup>
68+
6069
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6170
<ImportGroup Label="ExtensionSettings">
6271
</ImportGroup>

‎code/win32/msvc2017/libvorbis.vcxproj‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,39 @@
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
3030
<ProjectGuid>{06803141-6AB5-454C-BA05-1F2FB9C9CD3F}</ProjectGuid>
31-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
31+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.19041.0</WindowsTargetPlatformVersion>
32+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' &gt;= '16'">10.0</WindowsTargetPlatformVersion>
3233
</PropertyGroup>
3334
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3536
<ConfigurationType>StaticLibrary</ConfigurationType>
36-
<PlatformToolset>v141_xp</PlatformToolset>
37+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
38+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
3739
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3941
<ConfigurationType>StaticLibrary</ConfigurationType>
40-
<PlatformToolset>v141_xp</PlatformToolset>
42+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
43+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4144
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4346
<ConfigurationType>StaticLibrary</ConfigurationType>
44-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
48+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4549
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
50+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
4751
<ConfigurationType>StaticLibrary</ConfigurationType>
48-
<PlatformToolset>v141</PlatformToolset>
52+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
53+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
4954
</PropertyGroup>
50-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
55+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5156
<ConfigurationType>StaticLibrary</ConfigurationType>
52-
<PlatformToolset>v141</PlatformToolset>
57+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
58+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5359
</PropertyGroup>
54-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
61+
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
62+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '16'">$(DefaultPlatformToolset)</PlatformToolset>
5563
<ConfigurationType>StaticLibrary</ConfigurationType>
56-
<PlatformToolset>v141</PlatformToolset>
5764
</PropertyGroup>
5865
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5966
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)