diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-23 10:01:13 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-28 22:05:16 +0800 |
| commit | 8fbfbf38a8bd9d06514f05ebb4e8cadcc1143d6a (patch) | |
| tree | 20c849f840f28088660892a5a9a14a2c57015dc9 | |
| parent | d0680d574474e22f0b9877c8411c74507b2eaa2f (diff) | |
| download | gobject-introspection-8fbfbf38a8bd9d06514f05ebb4e8cadcc1143d6a.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/cmph-bdz-test.vcxproj | 2 | ||||
| -rw-r--r-- | build/win32/vs10/g-ir-compiler.vcxprojin | 2 | ||||
| -rw-r--r-- | build/win32/vs10/g-ir-generate.vcxproj | 2 | ||||
| -rw-r--r-- | build/win32/vs10/girepository.vcxprojin | 10 | ||||
| -rw-r--r-- | build/win32/vs10/glib-print.vcxproj | 2 |
5 files changed, 14 insertions, 4 deletions
diff --git a/build/win32/vs10/cmph-bdz-test.vcxproj b/build/win32/vs10/cmph-bdz-test.vcxproj index 5ea7323e..2086b344 100644 --- a/build/win32/vs10/cmph-bdz-test.vcxproj +++ b/build/win32/vs10/cmph-bdz-test.vcxproj @@ -110,6 +110,7 @@ <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -156,6 +157,7 @@ <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/g-ir-compiler.vcxprojin b/build/win32/vs10/g-ir-compiler.vcxprojin index 262cb546..9ba5efbf 100644 --- a/build/win32/vs10/g-ir-compiler.vcxprojin +++ b/build/win32/vs10/g-ir-compiler.vcxprojin @@ -133,6 +133,7 @@ <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -160,6 +161,7 @@ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <DataExecutionPrevention> </DataExecutionPrevention> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/g-ir-generate.vcxproj b/build/win32/vs10/g-ir-generate.vcxproj index cdbf2200..afa3b13e 100644 --- a/build/win32/vs10/g-ir-generate.vcxproj +++ b/build/win32/vs10/g-ir-generate.vcxproj @@ -107,6 +107,7 @@ <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -151,6 +152,7 @@ <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/girepository.vcxprojin b/build/win32/vs10/girepository.vcxprojin index 3da50079..dcd9bc92 100644 --- a/build/win32/vs10/girepository.vcxprojin +++ b/build/win32/vs10/girepository.vcxprojin @@ -88,10 +88,10 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -111,12 +111,13 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -139,10 +140,10 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -165,12 +166,13 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile> <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/glib-print.vcxproj b/build/win32/vs10/glib-print.vcxproj index 9c14a13d..0c3e49c6 100644 --- a/build/win32/vs10/glib-print.vcxproj +++ b/build/win32/vs10/glib-print.vcxproj @@ -107,6 +107,7 @@ <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -151,6 +152,7 @@ <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> |