Skip to content

Commit

Permalink
0003-win-vs2017-props
Browse files Browse the repository at this point in the history
Change-Id: I0973169a9edd5a8917093d217eb562ffba257a14
  • Loading branch information
Sébastien Blin committed Sep 7, 2023
1 parent 7e8b152 commit 5774b54
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions build/vs/pjproject-vs14-common-config.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
<PropertyGroup>
<API_Family Condition="'$(API_Family)'==''">WinDesktop</API_Family>
<PreprocessorDef></PreprocessorDef>
<DefaultToolset>v140</DefaultToolset>
<DefaultToolset>v141</DefaultToolset>
</PropertyGroup>
<Choose>
<When Condition="'$(API_Family)'=='WinDesktop'">
<PropertyGroup>
<BuildToolset>v140</BuildToolset>
<BuildToolset>v141</BuildToolset>
<PreprocessorDef Condition="'$(Platform)'=='Win32'">WIN32;PJ_WIN32=1;PJ_M_I386=1;</PreprocessorDef>
<PreprocessorDef Condition="'$(Platform)'=='x64'">WIN64;PJ_WIN64=1;PJ_M_X86_64=1;</PreprocessorDef>
<PreprocessorDef Condition="'$(Platform)'=='ARM64'">PJ_M_ARM64=1;</PreprocessorDef>
</PropertyGroup>
</When>
<When Condition="'$(API_Family)'=='UWP'">
<PropertyGroup>
<BuildToolset>v140</BuildToolset>
<BuildToolset>v141</BuildToolset>
<PreprocessorDef>PJ_WIN32_UWP;UNICODE;_UNICODE;</PreprocessorDef>
<PreprocessorDef Condition="'$(Platform)'=='ARM'">$(PreprocessorDef);PJ_M_ARMV7=1;</PreprocessorDef>
<PlatformVersion>10.0.10586.0</PlatformVersion>
<PlatformVersion>10.0.16299.0</PlatformVersion>
<MinPlatformVersion>10.0.10240.0</MinPlatformVersion>
<AppTypeRev>10.0</AppTypeRev>

Expand Down
2 changes: 1 addition & 1 deletion build/vs/pjproject-vs14-common-defaults.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ImportGroup Label="PropertySheets">
</ImportGroup>
<PropertyGroup Label="UserMacros">
<VSVer>14</VSVer>
<VSVer>15</VSVer>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
Expand Down

0 comments on commit 5774b54

Please sign in to comment.