[pango] Cleanup the Visual Studio 2008 Project Files
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] Cleanup the Visual Studio 2008 Project Files
- Date: Tue, 3 Dec 2013 06:59:56 +0000 (UTC)
commit 78395d1df00dc7002b1763daffb5c8894888e5aa
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Dec 3 14:59:45 2013 +0800
Cleanup the Visual Studio 2008 Project Files
Combine the non-PangoFT2 and PangoFT2 builds into one single solution file
and remove configs in the Pango and PangoWin32 projects that aren't really
necessary. Also use Link Time Code Generation for release builds to
improve optimization a bit.
build/win32/vs9/Makefile.am | 2 +-
build/win32/vs9/install.vcproj | 16 ++--
build/win32/vs9/pango-ignore-fc.vsprops | 12 +++
build/win32/vs9/pango.sln | 59 +++++++++++++
build/win32/vs9/pango.vcprojin | 135 ++----------------------------
build/win32/vs9/pango.vspropsin | 102 +++++++++++++++---------
build/win32/vs9/pango_fc.sln | 82 -------------------
build/win32/vs9/pangocairo.vcprojin | 20 +++--
build/win32/vs9/pangoft2.vcprojin | 6 +-
build/win32/vs9/pangowin32.vcproj | 135 ++-----------------------------
10 files changed, 177 insertions(+), 392 deletions(-)
---
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 46a0ea4..d1cc682 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,8 +1,8 @@
EXTRA_DIST = \
pango.sln \
- pango_fc.sln \
pango.vspropsin \
pango.vsprops \
+ pango-ignore-fc.vsprops \
pango.vcprojin \
pango.vcproj \
pangoft2.vcprojin \
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index fd8d64d..e8255ae 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -29,7 +29,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
+ CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
/>
</Configuration>
<Configuration
@@ -42,7 +42,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall)"
+ CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
/>
</Configuration>
<Configuration
@@ -56,7 +56,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
+ CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
/>
</Configuration>
<Configuration
@@ -70,7 +70,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall)"
+ CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
/>
</Configuration>
<Configuration
@@ -83,7 +83,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
+ CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
/>
</Configuration>
<Configuration
@@ -96,7 +96,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall)"
+ CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
/>
</Configuration>
<Configuration
@@ -110,7 +110,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
+ CommandLine="$(PangoInstallFC) $(PangoDoInstall)"
/>
</Configuration>
<Configuration
@@ -124,7 +124,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PangoDoInstall)"
+ CommandLine="$(PangoInstallNoFC) $(PangoDoInstall)"
/>
</Configuration>
</Configurations>
diff --git a/build/win32/vs9/pango-ignore-fc.vsprops b/build/win32/vs9/pango-ignore-fc.vsprops
new file mode 100644
index 0000000..965186f
--- /dev/null
+++ b/build/win32/vs9/pango-ignore-fc.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pangoignorefcprops"
+ >
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="$(OutDir)\pangowin32-1.0.lib $(OutDir)\pango-1.0.lib"
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/build/win32/vs9/pango.sln b/build/win32/vs9/pango.sln
index 1dc9f49..ec40845 100644
--- a/build/win32/vs9/pango.sln
+++ b/build/win32/vs9/pango.sln
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pango", "pango.vcproj",
"{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangoft2", "pangoft2.vcproj",
"{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}"
+ ProjectSection(ProjectDependencies) = postProject
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangowin32", "pangowin32.vcproj",
"{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}"
ProjectSection(ProjectDependencies) = postProject
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
@@ -10,12 +15,14 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangocairo", "pangocairo.vcproj",
"{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}"
ProjectSection(ProjectDependencies) = postProject
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
"{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
ProjectSection(ProjectDependencies) = postProject
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}
EndProjectSection
@@ -32,6 +39,10 @@ Global
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
+ Debug_FC|Win32 = Debug_FC|Win32
+ Debug_FC|x64 = Debug_FC|x64
+ Release_FC|Win32 = Release_FC|Win32
+ Release_FC|x64 = Release_FC|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -42,6 +53,26 @@ Global
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|Win32.Build.0 = Release|Win32
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.ActiveCfg = Release|x64
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.Build.0 = Release|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug_FC|Win32.ActiveCfg = Debug|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug_FC|Win32.Build.0 = Debug|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug_FC|x64.ActiveCfg = Debug|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug_FC|x64.Build.0 = Debug|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release_FC|Win32.ActiveCfg = Release|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release_FC|Win32.Build.0 = Release|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release_FC|x64.ActiveCfg = Release|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release_FC|x64.Build.0 = Release|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|Win32.ActiveCfg = Debug_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|x64.ActiveCfg = Debug_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|Win32.ActiveCfg = Release_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|x64.ActiveCfg = Release_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug_FC|Win32.ActiveCfg = Debug_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug_FC|Win32.Build.0 = Debug_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug_FC|x64.ActiveCfg = Debug_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug_FC|x64.Build.0 = Debug_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release_FC|Win32.ActiveCfg = Release_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release_FC|Win32.Build.0 = Release_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release_FC|x64.ActiveCfg = Release_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release_FC|x64.Build.0 = Release_FC|x64
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.ActiveCfg = Debug|Win32
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.Build.0 = Debug|Win32
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|x64.ActiveCfg = Debug|x64
@@ -50,6 +81,14 @@ Global
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|Win32.Build.0 = Release|Win32
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.ActiveCfg = Release|x64
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.Build.0 = Release|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug_FC|Win32.ActiveCfg = Debug|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug_FC|Win32.Build.0 = Debug|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug_FC|x64.ActiveCfg = Debug|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug_FC|x64.Build.0 = Debug|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release_FC|Win32.ActiveCfg = Release|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release_FC|Win32.Build.0 = Release|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release_FC|x64.ActiveCfg = Release|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release_FC|x64.Build.0 = Release|x64
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|Win32.ActiveCfg = Debug|Win32
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|Win32.Build.0 = Debug|Win32
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|x64.ActiveCfg = Debug|x64
@@ -58,6 +97,14 @@ Global
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|Win32.Build.0 = Release|Win32
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.ActiveCfg = Release|x64
{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.Build.0 = Release|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug_FC|Win32.ActiveCfg = Debug_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug_FC|Win32.Build.0 = Debug_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug_FC|x64.ActiveCfg = Debug_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug_FC|x64.Build.0 = Debug_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release_FC|Win32.ActiveCfg = Release_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release_FC|Win32.Build.0 = Release_FC|Win32
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release_FC|x64.ActiveCfg = Release_FC|x64
+ {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release_FC|x64.Build.0 = Release_FC|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
@@ -66,10 +113,22 @@ Global
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_FC|Win32.ActiveCfg = Debug_FC|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_FC|Win32.Build.0 = Debug_FC|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_FC|x64.ActiveCfg = Debug_FC|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_FC|x64.Build.0 = Debug_FC|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|Win32.ActiveCfg = Release_FC|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|Win32.Build.0 = Release_FC|Win32
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|x64.ActiveCfg = Release_FC|x64
+ {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|x64.Build.0 = Release_FC|x64
{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_FC|Win32.ActiveCfg = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_FC|x64.ActiveCfg = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_FC|Win32.ActiveCfg = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_FC|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/pango.vcprojin b/build/win32/vs9/pango.vcprojin
index d892d1a..bc70e3d 100644
--- a/build/win32/vs9/pango.vcprojin
+++ b/build/win32/vs9/pango.vcprojin
@@ -18,37 +18,6 @@
</Platforms>
<Configurations>
<Configuration
- Name="Debug_FC|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pango.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pango.vsprops"
@@ -60,7 +29,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -80,47 +49,18 @@
/>
</Configuration>
<Configuration
- Name="Release_FC|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pango.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pango.vsprops"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="$(PangoDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -129,7 +69,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pango.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -140,34 +80,6 @@
/>
</Configuration>
<Configuration
- Name="Debug_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
- ConfigurationType="2"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pango.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
Name="Debug|x64"
InheritedPropertySheets=".\pango.vsprops"
ConfigurationType="2"
@@ -176,7 +88,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -196,41 +108,15 @@
/>
</Configuration>
<Configuration
- Name="Release_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
- ConfigurationType="2"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pango.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
Name="Release|x64"
InheritedPropertySheets=".\pango.vsprops"
ConfigurationType="2"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="$(PangoDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -239,7 +125,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pango.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -264,10 +150,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File
- RelativePath="..\..\..\pango\pango.rc"
- >
- </File>
+ <File RelativePath="..\..\..\pango\pango.rc" />
</Filter>
<Filter
Name="Source Files"
diff --git a/build/win32/vs9/pango.vspropsin b/build/win32/vs9/pango.vspropsin
index 6987345..f4f74f1 100644
--- a/build/win32/vs9/pango.vspropsin
+++ b/build/win32/vs9/pango.vspropsin
@@ -51,11 +51,7 @@ copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WI
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
- />
- <UserMacro
- Name="GlibEtcInstallRootFromBuildWin32"
- Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
@@ -82,15 +78,48 @@ copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WI
Value="PANGO_VISUALC_NO_FC"
/>
<UserMacro
- Name="PangoDoInstall"
+ Name="PangoLibtoolCompatibleDllPrefix"
+ Value="lib"
+ />
+ <UserMacro
+ Name="PangoLibtoolCompatibleDllSuffix"
+ Value="-$(PangoApiVersion)-0"
+ />
+ <UserMacro
+ Name="PangoSeparateVSDllPrefix"
+ Value=""
+ />
+ <UserMacro
+ Name="PangoSeparateVSDllSuffix"
+ Value="-1-vs$(VSVer)"
+ />
+ <!-- Change these two to PangoLibtoolCompatibleDllPrefix and
+ PangoLibtoolCompatibleDllSuffix if that is what you want -->
+ <UserMacro
+ Name="PangoDllPrefix"
+ Value="$(PangoSeparateVSDllPrefix)"
+ />
+ <UserMacro
+ Name="PangoDllSuffix"
+ Value="$(PangoSeparateVSDllSuffix)"
+ />
+ <UserMacro
+ Name="PangoInstallNoFC"
Value="
-echo on

mkdir $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll
$(CopyDir)\bin

mkdir $(CopyDir)\lib

-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(PangoApiVersion).lib $(CopyDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib

+ "
+ />
+ <UserMacro
+ Name="PangoDoInstall"
+ Value="
#include "pango.vs9.headers"
copy ..\..\..\pango\pango-features.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango

@@ -108,8 +137,31 @@ echo monospace = "courier new,courier monothai,mingliu,simsun,gulimche,ms g
"
/>
<UserMacro
- Name="PangoInstallFCHeaders"
+ Name="PangoInstallFC"
Value="
+mkdir $(CopyDir)\bin

+mkdir $(CopyDir)\lib

+
+if "$(ConfigurationName)" == "Debug_FC" goto installDbg

+copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix)
$(CopyDir)\bin

+copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll
$(CopyDir)\bin

+copy $(SolutionDir)\Release\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib

+copy $(SolutionDir)\Release\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib

+goto installFcDLLs

+
+:installDbg

+copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix)
$(CopyDir)\bin

+copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll
$(CopyDir)\bin

+copy $(SolutionDir)\Debug\$(PlatformName)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib

+copy $(SolutionDir)\Debug\$(PlatformName)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib

+
+:installFcDLLs

+copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix).dll
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll
$(CopyDir)\bin

+copy $(ConfigurationName)\$(PlatformName)\bin\pangoft2-$(PangoApiVersion).lib $(CopyDir)\lib

+copy $(ConfigurationName)\$(PlatformName)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib

+
+mkdir $(CopyDir)\include\pango-$(PangoApiVersion)\pango

copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango

copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango

copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango

@@ -123,37 +175,11 @@ copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
set VSVER=$(VSVer)

set CONF=$(ConfigurationName)

set PLAT=$(PlatformName)

-set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)

+set BASEDIR=$(GlibEtcInstallRoot)

cd ..

call gengir_pango.bat

cd vs$(VSVer)

"
/>
- <UserMacro
- Name="PangoLibtoolCompatibleDllPrefix"
- Value="lib"
- />
- <UserMacro
- Name="PangoLibtoolCompatibleDllSuffix"
- Value="-$(PangoApiVersion)-0"
- />
- <UserMacro
- Name="PangoSeparateVSDllPrefix"
- Value=""
- />
- <UserMacro
- Name="PangoSeparateVSDllSuffix"
- Value="-1-vs$(VSVer)"
- />
- <!-- Change these two to PangoLibtoolCompatibleDllPrefix and
- PangoLibtoolCompatibleDllSuffix if that is what you want -->
- <UserMacro
- Name="PangoDllPrefix"
- Value="$(PangoSeparateVSDllPrefix)"
- />
- <UserMacro
- Name="PangoDllSuffix"
- Value="$(PangoSeparateVSDllSuffix)"
- />
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin
index c6a260f..3268c3c 100644
--- a/build/win32/vs9/pangocairo.vcprojin
+++ b/build/win32/vs9/pangocairo.vcprojin
@@ -53,7 +53,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
CharacterSet="2"
>
<Tool
@@ -89,6 +89,7 @@
ConfigurationType="2"
InheritedPropertySheets=".\pango.vsprops"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -106,7 +107,7 @@
Name="VCLinkerTool"
AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -119,8 +120,9 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -138,7 +140,7 @@
Name="VCLinkerTool"
AdditionalDependencies="cairo.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(PangoApiVersion).lib"
ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
GenerateDebugInformation="true"
@@ -181,7 +183,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -215,6 +217,7 @@
InheritedPropertySheets=".\pango.vsprops"
ConfigurationType="2"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
@@ -229,7 +232,7 @@
Name="VCLinkerTool"
AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -241,9 +244,10 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\pango.vsprops"
+ InheritedPropertySheets=".\pango.vsprops;.\pango-ignore-fc.vsprops"
ConfigurationType="2"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
@@ -258,7 +262,7 @@
Name="VCLinkerTool"
AdditionalDependencies="cairo.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin
index 520bc94..92a9f53 100644
--- a/build/win32/vs9/pangoft2.vcprojin
+++ b/build/win32/vs9/pangoft2.vcprojin
@@ -57,6 +57,7 @@
ConfigurationType="2"
InheritedPropertySheets=".\pango.vsprops"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -74,7 +75,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fontconfig.lib freetype.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -119,6 +120,7 @@
InheritedPropertySheets=".\pango.vsprops"
ConfigurationType="2"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
@@ -133,7 +135,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fontconfig.lib freetype.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
GenerateDebugInformation="true"
SubSystem="2"
diff --git a/build/win32/vs9/pangowin32.vcproj b/build/win32/vs9/pangowin32.vcproj
index d2d713f..bff8852 100644
--- a/build/win32/vs9/pangowin32.vcproj
+++ b/build/win32/vs9/pangowin32.vcproj
@@ -20,39 +20,6 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug_FC|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="usp10.lib"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pango.vsprops"
@@ -65,7 +32,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -86,48 +53,18 @@
/>
</Configuration>
<Configuration
- Name="Release_FC|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\pango.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="usp10.lib"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pango.vsprops"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="$(PangoDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -137,7 +74,7 @@
Name="VCLinkerTool"
AdditionalDependencies="usp10.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -148,35 +85,6 @@
/>
</Configuration>
<Configuration
- Name="Debug_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
- ConfigurationType="2"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="usp10.lib"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
Name="Debug|x64"
InheritedPropertySheets=".\pango.vsprops"
ConfigurationType="2"
@@ -185,7 +93,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -206,42 +114,15 @@
/>
</Configuration>
<Configuration
- Name="Release_FC|x64"
- InheritedPropertySheets=".\pango.vsprops"
- ConfigurationType="2"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="usp10.lib"
- OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
Name="Release|x64"
InheritedPropertySheets=".\pango.vsprops"
ConfigurationType="2"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+ PreprocessorDefinitions="$(PangoDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -251,7 +132,7 @@
Name="VCLinkerTool"
AdditionalDependencies="usp10.lib"
OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
- LinkIncremental="2"
+ LinkIncremental="1"
ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
GenerateDebugInformation="true"
SubSystem="2"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
