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

[Git][freetype/freetype][master] [builds/windows] Revise MSVC linking op

From: Alexei Podtelezhnikov (@apodtele)
Subject: [Git][freetype/freetype][master] [builds/windows] Revise MSVC linking optimizations.
Date: Fri, 29 Oct 2021 02:56:16 +0000

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

3 changed files:

Changes:

  • builds/windows/vc2010/freetype.vcxproj
    ... ... @@ -172,12 +172,10 @@
    172 172 
         </ResourceCompile>
    173 173 
         <Link>
    174 174 
           <GenerateDebugInformation>true</GenerateDebugInformation>
    175 
    -    </Link>
    176 
    -    <Lib>
    177 175 
           <TargetMachine>MachineARM64</TargetMachine>
    178 176 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    179 177 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    180 
    -    </Lib>
    178 
    +    </Link>
    181 179 
         <PreBuildEvent>
    182 180 
           <Command>call $(SolutionDir)script.bat</Command>
    183 181 
         </PreBuildEvent>
    ... ... @@ -204,12 +202,10 @@
    204 202 
         </ResourceCompile>
    205 203 
         <Link>
    206 204 
           <GenerateDebugInformation>true</GenerateDebugInformation>
    207 
    -    </Link>
    208 
    -    <Lib>
    209 205 
           <TargetMachine>MachineX64</TargetMachine>
    210 206 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    211 207 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    212 
    -    </Lib>
    208 
    +    </Link>
    213 209 
         <PreBuildEvent>
    214 210 
           <Command>call $(SolutionDir)script.bat</Command>
    215 211 
         </PreBuildEvent>
    ... ... @@ -236,12 +232,10 @@
    236 232 
         </ResourceCompile>
    237 233 
         <Link>
    238 234 
           <GenerateDebugInformation>true</GenerateDebugInformation>
    239 
    -    </Link>
    240 
    -    <Lib>
    241 235 
           <TargetMachine>MachineX86</TargetMachine>
    242 236 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    243 237 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    244 
    -    </Lib>
    238 
    +    </Link>
    245 239 
         <PreBuildEvent>
    246 240 
           <Command>call $(SolutionDir)script.bat</Command>
    247 241 
         </PreBuildEvent>
    ... ... @@ -268,12 +262,10 @@
    268 262 
         </ResourceCompile>
    269 263 
         <Link>
    270 264 
           <GenerateDebugInformation>true</GenerateDebugInformation>
    271 
    -    </Link>
    272 
    -    <Lib>
    273 265 
           <TargetMachine>MachineARM64</TargetMachine>
    274 266 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    275 267 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    276 
    -    </Lib>
    268 
    +    </Link>
    277 269 
         <PreBuildEvent>
    278 270 
           <Command>call $(SolutionDir)script.bat</Command>
    279 271 
         </PreBuildEvent>
    ... ... @@ -300,12 +292,10 @@
    300 292 
         </ResourceCompile>
    301 293 
         <Link>
    302 294 
           <GenerateDebugInformation>true</GenerateDebugInformation>
    303 
    -    </Link>
    304 
    -    <Lib>
    305 295 
           <TargetMachine>MachineX64</TargetMachine>
    306 296 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    307 297 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    308 
    -    </Lib>
    298 
    +    </Link>
    309 299 
         <PreBuildEvent>
    310 300 
           <Command>call $(SolutionDir)script.bat</Command>
    311 301 
         </PreBuildEvent>
    ... ... @@ -333,13 +323,10 @@
    333 323 
         <Link>
    334 324 
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    335 325 
           <OptimizeReferences>true</OptimizeReferences>
    336 
    -    </Link>
    337 
    -    <Lib>
    338 
    -      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    339 326 
           <TargetMachine>MachineX86</TargetMachine>
    340 327 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    341 328 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    342 
    -    </Lib>
    329 
    +    </Link>
    343 330 
       </ItemDefinitionGroup>
    344 331 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    345 332 
         <ClCompile>
    ... ... @@ -364,13 +351,10 @@
    364 351 
         <Link>
    365 352 
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    366 353 
           <OptimizeReferences>true</OptimizeReferences>
    367 
    -    </Link>
    368 
    -    <Lib>
    369 
    -      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    370 354 
           <TargetMachine>MachineARM64</TargetMachine>
    371 355 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    372 356 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    373 
    -    </Lib>
    357 
    +    </Link>
    374 358 
       </ItemDefinitionGroup>
    375 359 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    376 360 
         <ClCompile>
    ... ... @@ -394,13 +378,10 @@
    394 378 
         <Link>
    395 379 
           <EnableCOMDATFolding>true</EnableCOMDATFolding>
    396 380 
           <OptimizeReferences>true</OptimizeReferences>
    397 
    -    </Link>
    398 
    -    <Lib>
    399 
    -      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    400 381 
           <TargetMachine>MachineX64</TargetMachine>
    401 382 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    402 383 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    403 
    -    </Lib>
    384 
    +    </Link>
    404 385 
       </ItemDefinitionGroup>
    405 386 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
    406 387 
         <ClCompile>
    ... ... @@ -423,15 +404,10 @@
    423 404 
           <Culture>0x0409</Culture>
    424 405 
         </ResourceCompile>
    425 406 
         <Link>
    426 
    -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    427 
    -      <OptimizeReferences>true</OptimizeReferences>
    428 
    -    </Link>
    429 
    -    <Lib>
    430 
    -      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    431 407 
           <TargetMachine>MachineX86</TargetMachine>
    432 408 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    433 409 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    434 
    -    </Lib>
    410 
    +    </Link>
    435 411 
       </ItemDefinitionGroup>
    436 412 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|ARM64'">
    437 413 
         <ClCompile>
    ... ... @@ -454,15 +430,10 @@
    454 430 
           <Culture>0x0409</Culture>
    455 431 
         </ResourceCompile>
    456 432 
         <Link>
    457 
    -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    458 
    -      <OptimizeReferences>true</OptimizeReferences>
    459 
    -    </Link>
    460 
    -    <Lib>
    461 
    -      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    462 433 
           <TargetMachine>MachineARM64</TargetMachine>
    463 434 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    464 435 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    465 
    -    </Lib>
    436 
    +    </Link>
    466 437 
       </ItemDefinitionGroup>
    467 438 
       <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
    468 439 
         <ClCompile>
    ... ... @@ -484,15 +455,10 @@
    484 455 
           <Culture>0x0409</Culture>
    485 456 
         </ResourceCompile>
    486 457 
         <Link>
    487 
    -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    488 
    -      <OptimizeReferences>true</OptimizeReferences>
    489 
    -    </Link>
    490 
    -    <Lib>
    491 
    -      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
    492 458 
           <TargetMachine>MachineX64</TargetMachine>
    493 459 
           <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    494 460 
           <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    495 
    -    </Lib>
    461 
    +    </Link>
    496 462 
       </ItemDefinitionGroup>
    497 463 
       <ItemGroup>
    498 464 
         <ClCompile Include="..\..\..\src\autofit\autofit.c" />

  • builds/windows/visualc/freetype.dsp
    ... ... @@ -58,7 +58,7 @@ BSC32=bscmake.exe
    58 58 
     # ADD BSC32 /nologo
    59 59 
     LINK32=link.exe
    60 60 
     # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
    61 
    -# ADD LINK32 /nologo /dll /machine:I386 /out:"$(OutDir)\freetype.dll"
    61 
    +# ADD LINK32 /nologo /dll /machine:I386 /opt:REF,ICF /out:"$(OutDir)\freetype.dll"
    62 62
    63 63 
     !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
    64 64

  • builds/windows/visualc/freetype.vcproj
    ... ... @@ -66,6 +66,8 @@
    66 66 
     			/>
    67 67 
     			<Tool
    68 68 
     				Name="VCLinkerTool"
    69 
    +				OptimizeReferences="2"
    70 
    +				EnableCOMDATFolding="2"
    69 71 
     			/>
    70 72 
     			<Tool
    71 73 
     				Name="VCALinkTool"

    • —
    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]