[Git][freetype/freetype][master] [builds/windows] Separate MSVC linker and librarian.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• 31fd0547
  by Alexei Podtelezhnikov at 2021-10-29T10:13:47-04:00

  [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.
  

1 changed file:

• builds/windows/vc2010/freetype.vcxproj

Changes:

builds/windows/vc2010/freetype.vcxproj

---

...	...	@@ -140,12 +140,10 @@
140	140	</ResourceCompile>
141	141	<Link>
142	142	<GenerateDebugInformation>true</GenerateDebugInformation>
143		- </Link>
144		- <Lib>
145	143	<TargetMachine>MachineX86</TargetMachine>
146	144	<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
147	145	<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
148		- </Lib>
	146	+ </Link>
149	147	<PreBuildEvent>
150	148	<Command>call $(SolutionDir)script.bat</Command>
151	149	</PreBuildEvent>
...	...	@@ -230,12 +228,11 @@
230	228	<PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
231	229	<Culture>0x0409</Culture>
232	230	</ResourceCompile>
233		- <Link>
234		- <GenerateDebugInformation>true</GenerateDebugInformation>
	231	+ <Lib>
235	232	<TargetMachine>MachineX86</TargetMachine>
236	233	<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
237	234	<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
238		- </Link>
	235	+ </Lib>
239	236	<PreBuildEvent>
240	237	<Command>call $(SolutionDir)script.bat</Command>
241	238	</PreBuildEvent>
...	...	@@ -260,12 +257,11 @@
260	257	<PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
261	258	<Culture>0x0409</Culture>
262	259	</ResourceCompile>
263		- <Link>
264		- <GenerateDebugInformation>true</GenerateDebugInformation>
	260	+ <Lib>
265	261	<TargetMachine>MachineARM64</TargetMachine>
266	262	<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
267	263	<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
268		- </Link>
	264	+ </Lib>
269	265	<PreBuildEvent>
270	266	<Command>call $(SolutionDir)script.bat</Command>
271	267	</PreBuildEvent>
...	...	@@ -290,12 +286,11 @@
290	286	<PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
291	287	<Culture>0x0409</Culture>
292	288	</ResourceCompile>
293		- <Link>
294		- <GenerateDebugInformation>true</GenerateDebugInformation>
	289	+ <Lib>
295	290	<TargetMachine>MachineX64</TargetMachine>
296	291	<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
297	292	<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
298		- </Link>
	293	+ </Lib>
299	294	<PreBuildEvent>
300	295	<Command>call $(SolutionDir)script.bat</Command>
301	296	</PreBuildEvent>
...	...	@@ -403,11 +398,11 @@
403	398	<PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
404	399	<Culture>0x0409</Culture>
405	400	</ResourceCompile>
406		- <Link>
	401	+ <Lib>
407	402	<TargetMachine>MachineX86</TargetMachine>
408	403	<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
409	404	<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
410		- </Link>
	405	+ </Lib>
411	406	</ItemDefinitionGroup>
412	407	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|ARM64'">
413	408	<ClCompile>
...	...	@@ -429,11 +424,11 @@
429	424	<PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
430	425	<Culture>0x0409</Culture>
431	426	</ResourceCompile>
432		- <Link>
	427	+ <Lib>
433	428	<TargetMachine>MachineARM64</TargetMachine>
434	429	<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
435	430	<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
436		- </Link>
	431	+ </Lib>
437	432	</ItemDefinitionGroup>
438	433	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
439	434	<ClCompile>
...	...	@@ -454,11 +449,11 @@
454	449	<PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
455	450	<Culture>0x0409</Culture>
456	451	</ResourceCompile>
457		- <Link>
	452	+ <Lib>
458	453	<TargetMachine>MachineX64</TargetMachine>
459	454	<AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
460	455	<AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
461		- </Link>
	456	+ </Lib>
462	457	</ItemDefinitionGroup>
463	458	<ItemGroup>
464	459	<ClCompile Include="..\..\..\src\autofit\autofit.c" />

—
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.