freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master 31fd054: [builds/windows] Separate MSVC linker and li


From: Werner Lemberg
Subject: [freetype2] master 31fd054: [builds/windows] Separate MSVC linker and librarian.
Date: Fri, 29 Oct 2021 10:20:47 -0400 (EDT)

branch: master
commit 31fd054701c45526fdb223becb17105469c44c61
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    [builds/windows] Separate MSVC linker and librarian.
    
    MSVC uses LIB for static and LINK for dynamic libraries. They are
    related but the former has much smaller set of options.
    
    * builds/windows/vc2010/freetype.vcxproj: Updated.
---
 builds/windows/vc2010/freetype.vcxproj | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/builds/windows/vc2010/freetype.vcxproj 
b/builds/windows/vc2010/freetype.vcxproj
index 2a79266..ff901e9 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -140,12 +140,10 @@
     </ResourceCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
       <TargetMachine>MachineX86</TargetMachine>
       
<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
+    </Link>
     <PreBuildEvent>
       <Command>call $(SolutionDir)script.bat</Command>
     </PreBuildEvent>
@@ -230,12 +228,11 @@
       
<PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+    <Lib>
       <TargetMachine>MachineX86</TargetMachine>
       
<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
     <PreBuildEvent>
       <Command>call $(SolutionDir)script.bat</Command>
     </PreBuildEvent>
@@ -260,12 +257,11 @@
       
<PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+    <Lib>
       <TargetMachine>MachineARM64</TargetMachine>
       
<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
     <PreBuildEvent>
       <Command>call $(SolutionDir)script.bat</Command>
     </PreBuildEvent>
@@ -290,12 +286,11 @@
       
<PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+    <Lib>
       <TargetMachine>MachineX64</TargetMachine>
       
<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
     <PreBuildEvent>
       <Command>call $(SolutionDir)script.bat</Command>
     </PreBuildEvent>
@@ -403,11 +398,11 @@
       
<PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
+    <Lib>
       <TargetMachine>MachineX86</TargetMachine>
       
<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|ARM64'">
     <ClCompile>
@@ -429,11 +424,11 @@
       
<PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
+    <Lib>
       <TargetMachine>MachineARM64</TargetMachine>
       
<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 
Static|x64'">
     <ClCompile>
@@ -454,11 +449,11 @@
       
<PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
+    <Lib>
       <TargetMachine>MachineX64</TargetMachine>
       
<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\autofit\autofit.c" />



reply via email to

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