diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-23 09:52:40 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-23 09:52:40 +0800 |
commit | 03e60dc1c1f94345ed92aca4d9a6a2f17e48f690 (patch) | |
tree | 2a1c625355d15f7e3dd3f8fa3ea24b40b569d163 | |
parent | 39c8cfcc614f8901d347a047b3295a06082cbfee (diff) | |
download | pango-03e60dc1c1f94345ed92aca4d9a6a2f17e48f690.tar.gz |
MSVC release builds: Ensure that /LTCG is used
MSVC 2015 changed its default link-time code generation setting to
/LTCG:incremental, which causes problems if /opt:noref is to be used,
meaning that some code will be optimized out by the linker.
Avoid this situtation here by enforcing the use of /LTCG for MSVC 2010+
builds.
-rw-r--r-- | build/win32/vs10/pango.vcxprojin | 10 | ||||
-rw-r--r-- | build/win32/vs10/pangocairo.vcxprojin | 21 | ||||
-rw-r--r-- | build/win32/vs10/pangoft2.vcxprojin | 10 | ||||
-rw-r--r-- | build/win32/vs10/pangowin32.vcxprojin | 10 |
4 files changed, 31 insertions, 20 deletions
diff --git a/build/win32/vs10/pango.vcxprojin b/build/win32/vs10/pango.vcxprojin index e24b4ca1..093c20cf 100644 --- a/build/win32/vs10/pango.vcxprojin +++ b/build/win32/vs10/pango.vcxprojin @@ -87,9 +87,9 @@ <Link> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -104,12 +104,13 @@ </ClCompile> <Link> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -128,9 +129,9 @@ <Link> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -146,11 +147,12 @@ <Link> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin index a2fa5169..60af4416 100644 --- a/build/win32/vs10/pangocairo.vcxprojin +++ b/build/win32/vs10/pangocairo.vcxprojin @@ -151,9 +151,9 @@ <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(ApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -171,11 +171,12 @@ <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(ApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -196,9 +197,10 @@ <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(ApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -215,11 +217,12 @@ <AdditionalDependencies>cairo.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -239,9 +242,9 @@ <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -258,11 +261,12 @@ <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -282,9 +286,9 @@ <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -301,11 +305,12 @@ <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin index c811d789..e9a59a08 100644 --- a/build/win32/vs10/pangoft2.vcxprojin +++ b/build/win32/vs10/pangoft2.vcxprojin @@ -89,9 +89,9 @@ <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -109,11 +109,12 @@ <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -134,9 +135,9 @@ <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -154,11 +155,12 @@ <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/pangowin32.vcxprojin b/build/win32/vs10/pangowin32.vcxprojin index 31b5cc2f..169afe74 100644 --- a/build/win32/vs10/pangowin32.vcxprojin +++ b/build/win32/vs10/pangowin32.vcxprojin @@ -104,9 +104,9 @@ <AdditionalDependencies>usp10.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangowin32.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -123,11 +123,12 @@ <AdditionalDependencies>usp10.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangowin32.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -147,9 +148,9 @@ <AdditionalDependencies>usp10.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangowin32.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -166,11 +167,12 @@ <AdditionalDependencies>usp10.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> <ModuleDefinitionFile>..\..\..\pango\pangowin32.def</ModuleDefinitionFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> |