freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype-demos][master] [builds/windows] Use `props` to s


From: Alexei Podtelezhnikov (@apodtele)
Subject: [Git][freetype/freetype-demos][master] [builds/windows] Use `props` to share dependencies.
Date: Fri, 12 Nov 2021 20:37:21 +0000

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

Commits:

8 changed files:

Changes:

  • builds/windows/msvc/ft2demos.props
    1
    +<?xml version="1.0" ?>
    
    2
    +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    
    3
    +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    
    4
    +    <ClCompile>
    
    5
    +      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    
    6
    +    </ClCompile>
    
    7
    +    <Link>
    
    8
    +      <AdditionalLibraryDirectories>..\..\..\..\freetype\objs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    
    9
    +      <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
    
    10
    +    </Link>
    
    11
    +  </ItemDefinitionGroup>
    
    12
    +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    
    13
    +    <ClCompile>
    
    14
    +      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    
    15
    +    </ClCompile>
    
    16
    +    <Link>
    
    17
    +      <AdditionalLibraryDirectories>..\..\..\..\freetype\objs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    
    18
    +      <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
    
    19
    +    </Link>
    
    20
    +  </ItemDefinitionGroup>
    
    21
    +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    
    22
    +    <ClCompile>
    
    23
    +      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    
    24
    +    </ClCompile>
    
    25
    +    <Link>
    
    26
    +      <AdditionalLibraryDirectories>..\..\..\..\freetype\objs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    
    27
    +      <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
    
    28
    +    </Link>
    
    29
    +  </ItemDefinitionGroup>
    
    30
    +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    
    31
    +    <ClCompile>
    
    32
    +      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    
    33
    +    </ClCompile>
    
    34
    +    <Link>
    
    35
    +      <AdditionalLibraryDirectories>..\..\..\..\freetype\objs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    
    36
    +      <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
    
    37
    +    </Link>
    
    38
    +  </ItemDefinitionGroup>
    
    39
    +</Project>

  • builds/windows/msvc/ftbench.vcxproj
    ... ... @@ -88,7 +88,6 @@
    88 88
           <Optimization>Disabled</Optimization>
    
    89 89
           <SDLCheck>true</SDLCheck>
    
    90 90
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    91
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    92 91
         </ClCompile>
    
    93 92
         <PostBuildEvent>
    
    94 93
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -99,7 +98,6 @@
    99 98
           <WarningLevel>Level3</WarningLevel>
    
    100 99
           <Optimization>Disabled</Optimization>
    
    101 100
           <SDLCheck>true</SDLCheck>
    
    102
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    103 101
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    104 102
         </ClCompile>
    
    105 103
         <PostBuildEvent>
    
    ... ... @@ -113,7 +111,6 @@
    113 111
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    114 112
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    115 113
           <SDLCheck>true</SDLCheck>
    
    116
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    117 114
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    118 115
         </ClCompile>
    
    119 116
         <Link>
    
    ... ... @@ -131,7 +128,6 @@
    131 128
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    132 129
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    133 130
           <SDLCheck>true</SDLCheck>
    
    134
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    135 131
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    136 132
         </ClCompile>
    
    137 133
         <Link>
    
    ... ... @@ -151,10 +147,10 @@
    151 147
         <ClInclude Include="..\..\..\src\common.h" />
    
    152 148
         <ClInclude Include="..\..\..\src\mlgetopt.h" />
    
    153 149
       </ItemGroup>
    
    154
    -  <ItemGroup>
    
    155
    -    <Library Include="..\..\..\..\freetype\objs\freetype.lib" />
    
    156
    -  </ItemGroup>
    
    157 150
       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    
    158 151
       <ImportGroup Label="ExtensionTargets">
    
    159 152
       </ImportGroup>
    
    153
    +  <ImportGroup Label="Dependencies">
    
    154
    +    <Import Project="ft2demos.props" />
    
    155
    +  </ImportGroup>
    
    160 156
     </Project>

  • builds/windows/msvc/ftdump.vcxproj
    ... ... @@ -88,7 +88,6 @@
    88 88
           <Optimization>Disabled</Optimization>
    
    89 89
           <SDLCheck>true</SDLCheck>
    
    90 90
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    91
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    92 91
         </ClCompile>
    
    93 92
         <PostBuildEvent>
    
    94 93
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -99,7 +98,6 @@
    99 98
           <WarningLevel>Level3</WarningLevel>
    
    100 99
           <Optimization>Disabled</Optimization>
    
    101 100
           <SDLCheck>true</SDLCheck>
    
    102
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    103 101
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    104 102
         </ClCompile>
    
    105 103
         <PostBuildEvent>
    
    ... ... @@ -113,7 +111,6 @@
    113 111
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    114 112
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    115 113
           <SDLCheck>true</SDLCheck>
    
    116
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    117 114
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    118 115
         </ClCompile>
    
    119 116
         <Link>
    
    ... ... @@ -131,7 +128,6 @@
    131 128
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    132 129
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    133 130
           <SDLCheck>true</SDLCheck>
    
    134
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    135 131
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    136 132
         </ClCompile>
    
    137 133
         <Link>
    
    ... ... @@ -153,10 +149,10 @@
    153 149
         <ClInclude Include="..\..\..\src\mlgetopt.h" />
    
    154 150
         <ClInclude Include="..\..\..\src\output.h" />
    
    155 151
       </ItemGroup>
    
    156
    -  <ItemGroup>
    
    157
    -    <Library Include="..\..\..\..\freetype\objs\freetype.lib" />
    
    158
    -  </ItemGroup>
    
    159 152
       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    
    160 153
       <ImportGroup Label="ExtensionTargets">
    
    161 154
       </ImportGroup>
    
    155
    +  <ImportGroup Label="Dependencies">
    
    156
    +    <Import Project="ft2demos.props" />
    
    157
    +  </ImportGroup>
    
    162 158
     </Project>

  • builds/windows/msvc/ftgamma.vcxproj
    ... ... @@ -88,7 +88,7 @@
    88 88
           <WarningLevel>Level3</WarningLevel>
    
    89 89
           <Optimization>Disabled</Optimization>
    
    90 90
           <SDLCheck>true</SDLCheck>
    
    91
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    91
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    92 92
         </ClCompile>
    
    93 93
         <PostBuildEvent>
    
    94 94
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -100,7 +100,7 @@
    100 100
           <WarningLevel>Level3</WarningLevel>
    
    101 101
           <Optimization>Disabled</Optimization>
    
    102 102
           <SDLCheck>true</SDLCheck>
    
    103
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    103
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    104 104
         </ClCompile>
    
    105 105
         <PostBuildEvent>
    
    106 106
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -114,7 +114,7 @@
    114 114
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    115 115
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    116 116
           <SDLCheck>true</SDLCheck>
    
    117
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    117
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    118 118
         </ClCompile>
    
    119 119
         <Link>
    
    120 120
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    
    ... ... @@ -132,7 +132,7 @@
    132 132
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    133 133
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    134 134
           <SDLCheck>true</SDLCheck>
    
    135
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    135
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    136 136
         </ClCompile>
    
    137 137
         <Link>
    
    138 138
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    
    ... ... @@ -158,10 +158,10 @@
    158 158
           <Project>{5f517bbd-326a-4dc6-a42f-872d58501383}</Project>
    
    159 159
         </ProjectReference>
    
    160 160
       </ItemGroup>
    
    161
    -  <ItemGroup>
    
    162
    -    <Library Include="..\..\..\..\freetype\objs\freetype.lib" />
    
    163
    -  </ItemGroup>
    
    164 161
       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    
    165 162
       <ImportGroup Label="ExtensionTargets">
    
    166 163
       </ImportGroup>
    
    164
    +  <ImportGroup Label="Dependencies">
    
    165
    +    <Import Project="ft2demos.props" />
    
    166
    +  </ImportGroup>
    
    167 167
     </Project>

  • builds/windows/msvc/ftgrid.vcxproj
    ... ... @@ -88,7 +88,7 @@
    88 88
           <WarningLevel>Level3</WarningLevel>
    
    89 89
           <Optimization>Disabled</Optimization>
    
    90 90
           <SDLCheck>true</SDLCheck>
    
    91
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    91
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    92 92
         </ClCompile>
    
    93 93
         <PostBuildEvent>
    
    94 94
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -100,7 +100,7 @@
    100 100
           <WarningLevel>Level3</WarningLevel>
    
    101 101
           <Optimization>Disabled</Optimization>
    
    102 102
           <SDLCheck>true</SDLCheck>
    
    103
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    103
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    104 104
         </ClCompile>
    
    105 105
         <PostBuildEvent>
    
    106 106
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -114,7 +114,7 @@
    114 114
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    115 115
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    116 116
           <SDLCheck>true</SDLCheck>
    
    117
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    117
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    118 118
         </ClCompile>
    
    119 119
         <Link>
    
    120 120
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    
    ... ... @@ -132,7 +132,7 @@
    132 132
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    133 133
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    134 134
           <SDLCheck>true</SDLCheck>
    
    135
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    135
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    136 136
         </ClCompile>
    
    137 137
         <Link>
    
    138 138
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    
    ... ... @@ -163,10 +163,10 @@
    163 163
           <Project>{5f517bbd-326a-4dc6-a42f-872d58501383}</Project>
    
    164 164
         </ProjectReference>
    
    165 165
       </ItemGroup>
    
    166
    -  <ItemGroup>
    
    167
    -    <Library Include="..\..\..\..\freetype\objs\freetype.lib" />
    
    168
    -  </ItemGroup>
    
    169 166
       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    
    170 167
       <ImportGroup Label="ExtensionTargets">
    
    171 168
       </ImportGroup>
    
    169
    +  <ImportGroup Label="Dependencies">
    
    170
    +    <Import Project="ft2demos.props" />
    
    171
    +  </ImportGroup>
    
    172 172
     </Project>

  • builds/windows/msvc/ftlint.vcxproj
    ... ... @@ -88,7 +88,6 @@
    88 88
           <Optimization>Disabled</Optimization>
    
    89 89
           <SDLCheck>true</SDLCheck>
    
    90 90
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    91
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    92 91
         </ClCompile>
    
    93 92
         <PostBuildEvent>
    
    94 93
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -99,7 +98,6 @@
    99 98
           <WarningLevel>Level3</WarningLevel>
    
    100 99
           <Optimization>Disabled</Optimization>
    
    101 100
           <SDLCheck>true</SDLCheck>
    
    102
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    103 101
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    104 102
         </ClCompile>
    
    105 103
         <PostBuildEvent>
    
    ... ... @@ -113,7 +111,6 @@
    113 111
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    114 112
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    115 113
           <SDLCheck>true</SDLCheck>
    
    116
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    117 114
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    118 115
         </ClCompile>
    
    119 116
         <Link>
    
    ... ... @@ -131,7 +128,6 @@
    131 128
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    132 129
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    133 130
           <SDLCheck>true</SDLCheck>
    
    134
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include</AdditionalIncludeDirectories>
    
    135 131
           <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    
    136 132
         </ClCompile>
    
    137 133
         <Link>
    
    ... ... @@ -153,10 +149,10 @@
    153 149
         <ClInclude Include="..\..\..\src\mlgetopt.h" />
    
    154 150
         <ClInclude Include="..\..\..\src\md5.h" />
    
    155 151
       </ItemGroup>
    
    156
    -  <ItemGroup>
    
    157
    -    <Library Include="..\..\..\..\freetype\objs\freetype.lib" />
    
    158
    -  </ItemGroup>
    
    159 152
       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    
    160 153
       <ImportGroup Label="ExtensionTargets">
    
    161 154
       </ImportGroup>
    
    155
    +  <ImportGroup Label="Dependencies">
    
    156
    +    <Import Project="ft2demos.props" />
    
    157
    +  </ImportGroup>
    
    162 158
     </Project>

  • builds/windows/msvc/ftstring.vcxproj
    ... ... @@ -88,7 +88,7 @@
    88 88
           <WarningLevel>Level3</WarningLevel>
    
    89 89
           <Optimization>Disabled</Optimization>
    
    90 90
           <SDLCheck>true</SDLCheck>
    
    91
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    91
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    92 92
           <AdditionalOptions>/utf-8</AdditionalOptions>
    
    93 93
         </ClCompile>
    
    94 94
         <PostBuildEvent>
    
    ... ... @@ -101,7 +101,7 @@
    101 101
           <WarningLevel>Level3</WarningLevel>
    
    102 102
           <Optimization>Disabled</Optimization>
    
    103 103
           <SDLCheck>true</SDLCheck>
    
    104
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    104
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    105 105
           <AdditionalOptions>/utf-8</AdditionalOptions>
    
    106 106
         </ClCompile>
    
    107 107
         <PostBuildEvent>
    
    ... ... @@ -116,7 +116,7 @@
    116 116
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    117 117
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    118 118
           <SDLCheck>true</SDLCheck>
    
    119
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    119
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    120 120
           <AdditionalOptions>/utf-8</AdditionalOptions>
    
    121 121
         </ClCompile>
    
    122 122
         <Link>
    
    ... ... @@ -135,7 +135,7 @@
    135 135
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    136 136
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    137 137
           <SDLCheck>true</SDLCheck>
    
    138
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    138
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    139 139
           <AdditionalOptions>/utf-8</AdditionalOptions>
    
    140 140
         </ClCompile>
    
    141 141
         <Link>
    
    ... ... @@ -165,10 +165,10 @@
    165 165
           <Project>{5f517bbd-326a-4dc6-a42f-872d58501383}</Project>
    
    166 166
         </ProjectReference>
    
    167 167
       </ItemGroup>
    
    168
    -  <ItemGroup>
    
    169
    -    <Library Include="..\..\..\..\freetype\objs\freetype.lib" />
    
    170
    -  </ItemGroup>
    
    171 168
       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    
    172 169
       <ImportGroup Label="ExtensionTargets">
    
    173 170
       </ImportGroup>
    
    171
    +  <ImportGroup Label="Dependencies">
    
    172
    +    <Import Project="ft2demos.props" />
    
    173
    +  </ImportGroup>
    
    174 174
     </Project>

  • builds/windows/msvc/ftview.vcxproj
    ... ... @@ -88,7 +88,7 @@
    88 88
           <WarningLevel>Level3</WarningLevel>
    
    89 89
           <Optimization>Disabled</Optimization>
    
    90 90
           <SDLCheck>true</SDLCheck>
    
    91
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    91
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    92 92
         </ClCompile>
    
    93 93
         <PostBuildEvent>
    
    94 94
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -100,7 +100,7 @@
    100 100
           <WarningLevel>Level3</WarningLevel>
    
    101 101
           <Optimization>Disabled</Optimization>
    
    102 102
           <SDLCheck>true</SDLCheck>
    
    103
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    103
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    104 104
         </ClCompile>
    
    105 105
         <PostBuildEvent>
    
    106 106
           <Command>copy /b ..\..\..\objs\$(Platform)\$(Configuration)\$(TargetFileName) ..\..\..\bin\</Command>
    
    ... ... @@ -114,7 +114,7 @@
    114 114
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    115 115
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    116 116
           <SDLCheck>true</SDLCheck>
    
    117
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    117
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    118 118
         </ClCompile>
    
    119 119
         <Link>
    
    120 120
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    
    ... ... @@ -132,7 +132,7 @@
    132 132
           <FunctionLevelLinking>true</FunctionLevelLinking>
    
    133 133
           <IntrinsicFunctions>true</IntrinsicFunctions>
    
    134 134
           <SDLCheck>true</SDLCheck>
    
    135
    -      <AdditionalIncludeDirectories>..\..\..\..\freetype\include;..\..\..\graph</AdditionalIncludeDirectories>
    
    135
    +      <AdditionalIncludeDirectories>..\..\..\graph</AdditionalIncludeDirectories>
    
    136 136
         </ClCompile>
    
    137 137
         <Link>
    
    138 138
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    
    ... ... @@ -161,10 +161,10 @@
    161 161
           <Project>{5f517bbd-326a-4dc6-a42f-872d58501383}</Project>
    
    162 162
         </ProjectReference>
    
    163 163
       </ItemGroup>
    
    164
    -  <ItemGroup>
    
    165
    -    <Library Include="..\..\..\..\freetype\objs\freetype.lib" />
    
    166
    -  </ItemGroup>
    
    167 164
       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    
    168 165
       <ImportGroup Label="ExtensionTargets">
    
    169 166
       </ImportGroup>
    
    167
    +  <ImportGroup Label="Dependencies">
    
    168
    +    <Import Project="ft2demos.props" />
    
    169
    +  </ImportGroup>
    
    170 170
     </Project>


  • reply via email to

    [Prev in Thread] Current Thread [Next in Thread]