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

[Git][freetype/freetype][master] 2 commits: [builds/windows] Add MSVC li

From: Alexei Podtelezhnikov (@apodtele)
Subject: [Git][freetype/freetype][master] 2 commits: [builds/windows] Add MSVC linker optimazations.
Date: Tue, 26 Oct 2021 02:40:01 +0000

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

2 changed files:

Changes:

  • builds/windows/vc2010/freetype.vcxproj
    1 1 
     <?xml version="1.0" encoding="utf-8"?>
    2 2 
     <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    3 3 
       <ItemGroup Label="ProjectConfigurations">
    4 
    -    <ProjectConfiguration Include="Debug Static|ARM64">
    5 
    -      <Configuration>Debug Static</Configuration>
    6 
    -      <Platform>ARM64</Platform>
    4 
    +    <ProjectConfiguration Include="Debug|Win32">
    5 
    +      <Configuration>Debug</Configuration>
    6 
    +      <Platform>Win32</Platform>
    7 7 
         </ProjectConfiguration>
    8 8 
         <ProjectConfiguration Include="Debug|ARM64">
    9 9 
           <Configuration>Debug</Configuration>
    10 10 
           <Platform>ARM64</Platform>
    11 11 
         </ProjectConfiguration>
    12 
    -    <ProjectConfiguration Include="Debug|Win32">
    13 
    -      <Configuration>Debug</Configuration>
    14 
    -      <Platform>Win32</Platform>
    15 
    -    </ProjectConfiguration>
    16 12 
         <ProjectConfiguration Include="Debug|x64">
    17 13 
           <Configuration>Debug</Configuration>
    18 14 
           <Platform>x64</Platform>
    ... ... @@ -21,22 +17,22 @@
    21 17 
           <Configuration>Debug Static</Configuration>
    22 18 
           <Platform>Win32</Platform>
    23 19 
         </ProjectConfiguration>
    20 
    +    <ProjectConfiguration Include="Debug Static|ARM64">
    21 
    +      <Configuration>Debug Static</Configuration>
    22 
    +      <Platform>ARM64</Platform>
    23 
    +    </ProjectConfiguration>
    24 24 
         <ProjectConfiguration Include="Debug Static|x64">
    25 25 
           <Configuration>Debug Static</Configuration>
    26 26 
           <Platform>x64</Platform>
    27 27 
         </ProjectConfiguration>
    28 
    -    <ProjectConfiguration Include="Release Static|ARM64">
    29 
    -      <Configuration>Release Static</Configuration>
    30 
    -      <Platform>ARM64</Platform>
    28 
    +    <ProjectConfiguration Include="Release|Win32">
    29 
    +      <Configuration>Release</Configuration>
    30 
    +      <Platform>Win32</Platform>
    31 31 
         </ProjectConfiguration>
    32 32 
         <ProjectConfiguration Include="Release|ARM64">
    33 33 
           <Configuration>Release</Configuration>
    34 34 
           <Platform>ARM64</Platform>
    35 35 
         </ProjectConfiguration>
    36 
    -    <ProjectConfiguration Include="Release|Win32">
    37 
    -      <Configuration>Release</Configuration>
    38 
    -      <Platform>Win32</Platform>
    39 
    -    </ProjectConfiguration>
    40 36 
         <ProjectConfiguration Include="Release|x64">
    41 37 
           <Configuration>Release</Configuration>
    42 38 
           <Platform>x64</Platform>
    ... ... @@ -45,6 +41,10 @@
    45 41 
           <Configuration>Release Static</Configuration>
    46 42 
           <Platform>Win32</Platform>
    47 43 
         </ProjectConfiguration>
    44 
    +    <ProjectConfiguration Include="Release Static|ARM64">
    45 
    +      <Configuration>Release Static</Configuration>
    46 
    +      <Platform>ARM64</Platform>
    47 
    +    </ProjectConfiguration>
    48 48 
         <ProjectConfiguration Include="Release Static|x64">
    49 49 
           <Configuration>Release Static</Configuration>
    50 50 
           <Platform>x64</Platform>
    ... ... @@ -138,6 +138,9 @@
    138 138 
           <PreprocessorDefinitions>_DEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    139 139 
           <Culture>0x0409</Culture>
    140 140 
         </ResourceCompile>
    141 
    +    <Link>
    142 
    +      <GenerateDebugInformation>true</GenerateDebugInformation>
    143 
    +    </Link>
    141 144 
         <Lib>
    142 145 
           <TargetMachine>MachineX86</TargetMachine>
    143 146 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    ... ... @@ -153,6 +156,7 @@
    153 156 
           <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    154 157 
           <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    155 158 
           <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    159 
    +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    156 160 
           <DisableLanguageExtensions>false</DisableLanguageExtensions>
    157 161 
           <WarningLevel>Level4</WarningLevel>
    158 162 
           <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    ... ... @@ -166,6 +170,9 @@
    166 170 
           <PreprocessorDefinitions>_DEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    167 171 
           <Culture>0x0409</Culture>
    168 172 
         </ResourceCompile>
    173 
    +    <Link>
    174 
    +      <GenerateDebugInformation>true</GenerateDebugInformation>
    175 
    +    </Link>
    169 176 
         <Lib>
    170 177 
           <TargetMachine>MachineARM64</TargetMachine>
    171 178 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    ... ... @@ -195,6 +202,9 @@
    195 202 
           <PreprocessorDefinitions>_DEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    196 203 
           <Culture>0x0409</Culture>
    197 204 
         </ResourceCompile>
    205 
    +    <Link>
    206 
    +      <GenerateDebugInformation>true</GenerateDebugInformation>
    207 
    +    </Link>
    198 208 
         <Lib>
    199 209 
           <TargetMachine>MachineX64</TargetMachine>
    200 210 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    ... ... @@ -224,6 +234,9 @@
    224 234 
           <PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    225 235 
           <Culture>0x0409</Culture>
    226 236 
         </ResourceCompile>
    237 
    +    <Link>
    238 
    +      <GenerateDebugInformation>true</GenerateDebugInformation>
    239 
    +    </Link>
    227 240 
         <Lib>
    228 241 
           <TargetMachine>MachineX86</TargetMachine>
    229 242 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    ... ... @@ -239,6 +252,7 @@
    239 252 
           <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    240 253 
           <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    241 254 
           <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    255 
    +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    242 256 
           <DisableLanguageExtensions>false</DisableLanguageExtensions>
    243 257 
           <WarningLevel>Level4</WarningLevel>
    244 258 
           <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    ... ... @@ -252,6 +266,9 @@
    252 266 
           <PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    253 267 
           <Culture>0x0409</Culture>
    254 268 
         </ResourceCompile>
    269 
    +    <Link>
    270 
    +      <GenerateDebugInformation>true</GenerateDebugInformation>
    271 
    +    </Link>
    255 272 
         <Lib>
    256 273 
           <TargetMachine>MachineARM64</TargetMachine>
    257 274 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    ... ... @@ -281,6 +298,9 @@
    281 298 
           <PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    282 299 
           <Culture>0x0409</Culture>
    283 300 
         </ResourceCompile>
    301 
    +    <Link>
    302 
    +      <GenerateDebugInformation>true</GenerateDebugInformation>
    303 
    +    </Link>
    284 304 
         <Lib>
    285 305 
           <TargetMachine>MachineX64</TargetMachine>
    286 306 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    ... ... @@ -310,6 +330,10 @@
    310 330 
           <PreprocessorDefinitions>NDEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    311 331 
           <Culture>0x0409</Culture>
    312 332 
         </ResourceCompile>
    333 
    +    <Link>
    334 
    +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    335 
    +      <OptimizeReferences>true</OptimizeReferences>
    336 
    +    </Link>
    313 337 
         <Lib>
    314 338 
           <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    315 339 
           <TargetMachine>MachineX86</TargetMachine>
    ... ... @@ -323,6 +347,7 @@
    323 347 
           <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
    324 348 
           <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    325 349 
           <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    350 
    +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    326 351 
           <FunctionLevelLinking>true</FunctionLevelLinking>
    327 352 
           <DisableLanguageExtensions>true</DisableLanguageExtensions>
    328 353 
           <WarningLevel>Level4</WarningLevel>
    ... ... @@ -336,6 +361,10 @@
    336 361 
           <PreprocessorDefinitions>NDEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    337 362 
           <Culture>0x0409</Culture>
    338 363 
         </ResourceCompile>
    364 
    +    <Link>
    365 
    +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    366 
    +      <OptimizeReferences>true</OptimizeReferences>
    367 
    +    </Link>
    339 368 
         <Lib>
    340 369 
           <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    341 370 
           <TargetMachine>MachineARM64</TargetMachine>
    ... ... @@ -362,6 +391,10 @@
    362 391 
           <PreprocessorDefinitions>NDEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    363 392 
           <Culture>0x0409</Culture>
    364 393 
         </ResourceCompile>
    394 
    +    <Link>
    395 
    +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    396 
    +      <OptimizeReferences>true</OptimizeReferences>
    397 
    +    </Link>
    365 398 
         <Lib>
    366 399 
           <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    367 400 
           <TargetMachine>MachineX64</TargetMachine>
    ... ... @@ -389,6 +422,10 @@
    389 422 
           <PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    390 423 
           <Culture>0x0409</Culture>
    391 424 
         </ResourceCompile>
    425 
    +    <Link>
    426 
    +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    427 
    +      <OptimizeReferences>true</OptimizeReferences>
    428 
    +    </Link>
    392 429 
         <Lib>
    393 430 
           <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    394 431 
           <TargetMachine>MachineX86</TargetMachine>
    ... ... @@ -402,6 +439,7 @@
    402 439 
           <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
    403 440 
           <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    404 441 
           <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    442 
    +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    405 443 
           <FunctionLevelLinking>true</FunctionLevelLinking>
    406 444 
           <DisableLanguageExtensions>true</DisableLanguageExtensions>
    407 445 
           <WarningLevel>Level4</WarningLevel>
    ... ... @@ -415,6 +453,10 @@
    415 453 
           <PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    416 454 
           <Culture>0x0409</Culture>
    417 455 
         </ResourceCompile>
    456 
    +    <Link>
    457 
    +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    458 
    +      <OptimizeReferences>true</OptimizeReferences>
    459 
    +    </Link>
    418 460 
         <Lib>
    419 461 
           <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    420 462 
           <TargetMachine>MachineARM64</TargetMachine>
    ... ... @@ -441,6 +483,10 @@
    441 483 
           <PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    442 484 
           <Culture>0x0409</Culture>
    443 485 
         </ResourceCompile>
    486 
    +    <Link>
    487 
    +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    488 
    +      <OptimizeReferences>true</OptimizeReferences>
    489 
    +    </Link>
    444 490 
         <Lib>
    445 491 
           <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    446 492 
           <TargetMachine>MachineX64</TargetMachine>

  • src/type1/t1load.c
    ... ... @@ -133,9 +133,9 @@
    133 133
    134 134
    135 135 
             /* allocate the blend `private' and `font_info' dictionaries */
    136 
    -        if ( FT_QNEW_ARRAY( blend->font_infos[1], num_designs ) ||
    137 
    -             FT_QNEW_ARRAY( blend->privates  [1], num_designs ) ||
    138 
    -             FT_QNEW_ARRAY( blend->bboxes    [1], num_designs ) )
    136 
    +        if ( FT_NEW_ARRAY( blend->font_infos[1], num_designs ) ||
    137 
    +             FT_NEW_ARRAY( blend->privates  [1], num_designs ) ||
    138 
    +             FT_NEW_ARRAY( blend->bboxes    [1], num_designs ) )
    139 139 
               goto Exit;
    140 140
    141 141 
             blend->font_infos[0] = &face->type1.font_info;

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.

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