freetype-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype-demos][master] [msbuild] Isolate more properties

From: Alexei Podtelezhnikov (@apodtele)
Subject: [Git][freetype/freetype-demos][master] [msbuild] Isolate more properties.
Date: Fri, 08 Dec 2023 03:31:50 +0000

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs

Commits:

  • 404c2818
    by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-12-07T22:22:12-05:00 
    [msbuild] Isolate more properties.

* builds/windows/msvc/*.vcxproj: Move `IntDir` and `OutDir` to...
* builds/windows/msvc/ft2demos.props: ... here.

9 changed files:

Changes:

  • builds/windows/msvc/ft2demos.props
    1 1 
     <?xml version="1.0" ?>
    2 2 
     <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    3 
    +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    4 
    +    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    5 
    +    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    6 
    +  </PropertyGroup>
    7 
    +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    8 
    +    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    9 
    +    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    10 
    +  </PropertyGroup>
    11 
    +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    12 
    +    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    13 
    +    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    14 
    +  </PropertyGroup>
    15 
    +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    16 
    +    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    17 
    +    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    18 
    +  </PropertyGroup>
    3 19 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    4 20 
         <ClCompile>
    5 21 
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

  • builds/windows/msvc/ftbench.vcxproj
    ... ... @@ -66,22 +66,7 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
       </ItemDefinitionGroup>
    87 72 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    ... ... @@ -101,6 +86,5 @@
    101 86 
       <ImportGroup Label="ExtensionTargets">
    102 87 
       </ImportGroup>
    103 88 
       <ImportGroup Label="Dependencies">
    104 
    -    <Import Project="ft2demos.props" />
    105 89 
       </ImportGroup>
    106 90 
     </Project>

  • builds/windows/msvc/ftdump.vcxproj
    ... ... @@ -66,22 +66,7 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
       </ItemDefinitionGroup>
    87 72 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    ... ... @@ -105,6 +90,5 @@
    105 90 
       <ImportGroup Label="ExtensionTargets">
    106 91 
       </ImportGroup>
    107 92 
       <ImportGroup Label="Dependencies">
    108 
    -    <Import Project="ft2demos.props" />
    109 93 
       </ImportGroup>
    110 94 
     </Project>

  • builds/windows/msvc/ftgamma.vcxproj
    ... ... @@ -66,40 +66,25 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
         <ClCompile>
    87 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    72 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    88 73 
         </ClCompile>
    89 74 
       </ItemDefinitionGroup>
    90 75 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    91 76 
         <ClCompile>
    92 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    77 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    93 78 
         </ClCompile>
    94 79 
       </ItemDefinitionGroup>
    95 80 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    96 81 
         <ClCompile>
    97 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    82 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    98 83 
         </ClCompile>
    99 84 
       </ItemDefinitionGroup>
    100 85 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    101 86 
         <ClCompile>
    102 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    87 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    103 88 
         </ClCompile>
    104 89 
       </ItemDefinitionGroup>
    105 90 
       <ItemGroup>
    ... ... @@ -124,6 +109,5 @@
    124 109 
       <ImportGroup Label="ExtensionTargets">
    125 110 
       </ImportGroup>
    126 111 
       <ImportGroup Label="Dependencies">
    127 
    -    <Import Project="ft2demos.props" />
    128 112 
       </ImportGroup>
    129 113 
     </Project>

  • builds/windows/msvc/ftgrid.vcxproj
    ... ... @@ -66,40 +66,25 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
         <ClCompile>
    87 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    72 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    88 73 
         </ClCompile>
    89 74 
       </ItemDefinitionGroup>
    90 75 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    91 76 
         <ClCompile>
    92 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    77 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    93 78 
         </ClCompile>
    94 79 
       </ItemDefinitionGroup>
    95 80 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    96 81 
         <ClCompile>
    97 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    82 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    98 83 
         </ClCompile>
    99 84 
       </ItemDefinitionGroup>
    100 85 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    101 86 
         <ClCompile>
    102 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    87 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    103 88 
         </ClCompile>
    104 89 
       </ItemDefinitionGroup>
    105 90 
       <ItemGroup>
    ... ... @@ -129,6 +114,5 @@
    129 114 
       <ImportGroup Label="ExtensionTargets">
    130 115 
       </ImportGroup>
    131 116 
       <ImportGroup Label="Dependencies">
    132 
    -    <Import Project="ft2demos.props" />
    133 117 
       </ImportGroup>
    134 118 
     </Project>

  • builds/windows/msvc/ftlint.vcxproj
    ... ... @@ -66,22 +66,7 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
       </ItemDefinitionGroup>
    87 72 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    ... ... @@ -105,6 +90,5 @@
    105 90 
       <ImportGroup Label="ExtensionTargets">
    106 91 
       </ImportGroup>
    107 92 
       <ImportGroup Label="Dependencies">
    108 
    -    <Import Project="ft2demos.props" />
    109 93 
       </ImportGroup>
    110 94 
     </Project>

  • builds/windows/msvc/ftmulti.vcxproj
    ... ... @@ -66,40 +66,25 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
         <ClCompile>
    87 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    72 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    88 73 
         </ClCompile>
    89 74 
       </ItemDefinitionGroup>
    90 75 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    91 76 
         <ClCompile>
    92 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    77 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    93 78 
         </ClCompile>
    94 79 
       </ItemDefinitionGroup>
    95 80 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    96 81 
         <ClCompile>
    97 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    82 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    98 83 
         </ClCompile>
    99 84 
       </ItemDefinitionGroup>
    100 85 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    101 86 
         <ClCompile>
    102 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    87 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    103 88 
         </ClCompile>
    104 89 
       </ItemDefinitionGroup>
    105 90 
       <ItemGroup>
    ... ... @@ -126,6 +111,5 @@
    126 111 
       <ImportGroup Label="ExtensionTargets">
    127 112 
       </ImportGroup>
    128 113 
       <ImportGroup Label="Dependencies">
    129 
    -    <Import Project="ft2demos.props" />
    130 114 
       </ImportGroup>
    131 115 
     </Project>

  • builds/windows/msvc/ftstring.vcxproj
    ... ... @@ -66,43 +66,28 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
         <ClCompile>
    87 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    72 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    88 73 
           <AdditionalOptions>/utf-8</AdditionalOptions>
    89 74 
         </ClCompile>
    90 75 
       </ItemDefinitionGroup>
    91 76 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    92 77 
         <ClCompile>
    93 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    78 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    94 79 
           <AdditionalOptions>/utf-8</AdditionalOptions>
    95 80 
         </ClCompile>
    96 81 
       </ItemDefinitionGroup>
    97 82 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    98 83 
         <ClCompile>
    99 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    84 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    100 85 
           <AdditionalOptions>/utf-8</AdditionalOptions>
    101 86 
         </ClCompile>
    102 87 
       </ItemDefinitionGroup>
    103 88 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    104 89 
         <ClCompile>
    105 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    90 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    106 91 
           <AdditionalOptions>/utf-8</AdditionalOptions>
    107 92 
         </ClCompile>
    108 93 
       </ItemDefinitionGroup>
    ... ... @@ -131,6 +116,5 @@
    131 116 
       <ImportGroup Label="ExtensionTargets">
    132 117 
       </ImportGroup>
    133 118 
       <ImportGroup Label="Dependencies">
    134 
    -    <Import Project="ft2demos.props" />
    135 119 
       </ImportGroup>
    136 120 
     </Project>

  • builds/windows/msvc/ftview.vcxproj
    ... ... @@ -66,40 +66,25 @@
    66 66 
         <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    67 67 
       </ImportGroup>
    68 68 
       <PropertyGroup Label="UserMacros" />
    69 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    70 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    71 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    72 
    -  </PropertyGroup>
    73 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    74 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    75 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    76 
    -  </PropertyGroup>
    77 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    78 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    79 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    80 
    -  </PropertyGroup>
    81 
    -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    82 
    -    <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
    83 
    -    <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
    84 
    -  </PropertyGroup>
    69 
    +  <Import Project="ft2demos.props" />
    85 70 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86 71 
         <ClCompile>
    87 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    72 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    88 73 
         </ClCompile>
    89 74 
       </ItemDefinitionGroup>
    90 75 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    91 76 
         <ClCompile>
    92 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    77 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    93 78 
         </ClCompile>
    94 79 
       </ItemDefinitionGroup>
    95 80 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    96 81 
         <ClCompile>
    97 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    82 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    98 83 
         </ClCompile>
    99 84 
       </ItemDefinitionGroup>
    100 85 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    101 86 
         <ClCompile>
    102 
    -      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    87 
    +      <AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    103 88 
         </ClCompile>
    104 89 
       </ItemDefinitionGroup>
    105 90 
       <ItemGroup>
    ... ... @@ -127,6 +112,5 @@
    127 112 
       <ImportGroup Label="ExtensionTargets">
    128 113 
       </ImportGroup>
    129 114 
       <ImportGroup Label="Dependencies">
    130 
    -    <Import Project="ft2demos.props" />
    131 115 
       </ImportGroup>
    132 116 
     </Project>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help

    reply via email to
    [Prev in Thread] Current Thread [Next in Thread]