[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 404c281: [msbuild] Isolate more properties.
|
From: |
Werner Lemberg |
|
Subject: |
[freetype2-demos] master 404c281: [msbuild] Isolate more properties. |
|
Date: |
Thu, 7 Dec 2023 22:31:56 -0500 (EST) |
branch: master
commit 404c2818babcb4b5f5a866c53b1e925f7799c4e0
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
[msbuild] Isolate more properties.
* builds/windows/msvc/*.vcxproj: Move `IntDir` and `OutDir` to...
* builds/windows/msvc/ft2demos.props: ... here.
---
builds/windows/msvc/ft2demos.props | 16 ++++++++++++++++
builds/windows/msvc/ftbench.vcxproj | 18 +-----------------
builds/windows/msvc/ftdump.vcxproj | 18 +-----------------
builds/windows/msvc/ftgamma.vcxproj | 26 +++++---------------------
builds/windows/msvc/ftgrid.vcxproj | 26 +++++---------------------
builds/windows/msvc/ftlint.vcxproj | 18 +-----------------
builds/windows/msvc/ftmulti.vcxproj | 26 +++++---------------------
builds/windows/msvc/ftstring.vcxproj | 26 +++++---------------------
builds/windows/msvc/ftview.vcxproj | 26 +++++---------------------
9 files changed, 44 insertions(+), 156 deletions(-)
diff --git a/builds/windows/msvc/ft2demos.props
b/builds/windows/msvc/ft2demos.props
index 5c92aca..db2020b 100644
--- a/builds/windows/msvc/ft2demos.props
+++ b/builds/windows/msvc/ft2demos.props
@@ -1,5 +1,21 @@
<?xml version="1.0" ?>
<Project ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/builds/windows/msvc/ftbench.vcxproj
b/builds/windows/msvc/ftbench.vcxproj
index 3797920..264ed52 100644
--- a/builds/windows/msvc/ftbench.vcxproj
+++ b/builds/windows/msvc/ftbench.vcxproj
@@ -66,22 +66,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -101,6 +86,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
diff --git a/builds/windows/msvc/ftdump.vcxproj
b/builds/windows/msvc/ftdump.vcxproj
index 4ba60e8..5f82851 100644
--- a/builds/windows/msvc/ftdump.vcxproj
+++ b/builds/windows/msvc/ftdump.vcxproj
@@ -66,22 +66,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -105,6 +90,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
diff --git a/builds/windows/msvc/ftgamma.vcxproj
b/builds/windows/msvc/ftgamma.vcxproj
index 6d19edb..88f0dbe 100644
--- a/builds/windows/msvc/ftgamma.vcxproj
+++ b/builds/windows/msvc/ftgamma.vcxproj
@@ -66,40 +66,25 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -124,6 +109,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
diff --git a/builds/windows/msvc/ftgrid.vcxproj
b/builds/windows/msvc/ftgrid.vcxproj
index 56a41d7..aec584f 100644
--- a/builds/windows/msvc/ftgrid.vcxproj
+++ b/builds/windows/msvc/ftgrid.vcxproj
@@ -66,40 +66,25 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -129,6 +114,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
diff --git a/builds/windows/msvc/ftlint.vcxproj
b/builds/windows/msvc/ftlint.vcxproj
index 9862bca..7fd6fcf 100644
--- a/builds/windows/msvc/ftlint.vcxproj
+++ b/builds/windows/msvc/ftlint.vcxproj
@@ -66,22 +66,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -105,6 +90,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
diff --git a/builds/windows/msvc/ftmulti.vcxproj
b/builds/windows/msvc/ftmulti.vcxproj
index 384db9b..c0c293e 100644
--- a/builds/windows/msvc/ftmulti.vcxproj
+++ b/builds/windows/msvc/ftmulti.vcxproj
@@ -66,40 +66,25 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -126,6 +111,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
diff --git a/builds/windows/msvc/ftstring.vcxproj
b/builds/windows/msvc/ftstring.vcxproj
index 51f9a5a..187c315 100644
--- a/builds/windows/msvc/ftstring.vcxproj
+++ b/builds/windows/msvc/ftstring.vcxproj
@@ -66,43 +66,28 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/utf-8</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/utf-8</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/utf-8</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/utf-8</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
@@ -131,6 +116,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
diff --git a/builds/windows/msvc/ftview.vcxproj
b/builds/windows/msvc/ftview.vcxproj
index 4ef33c9..46cd9cf 100644
--- a/builds/windows/msvc/ftview.vcxproj
+++ b/builds/windows/msvc/ftview.vcxproj
@@ -66,40 +66,25 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\..\..\objs\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>..\..\..\objs\$(Platform)\$(Configuration)\</OutDir>
- </PropertyGroup>
+ <Import Project="ft2demos.props" />
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\graph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -127,6 +112,5 @@
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ImportGroup Label="Dependencies">
- <Import Project="ft2demos.props" />
</ImportGroup>
</Project>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 404c281: [msbuild] Isolate more properties.,
Werner Lemberg <=