diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-04-09 18:30:15 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-04-09 18:30:15 +0800 |
| commit | 991d74a9947c050e12ca4f8509a05ddee6d0f3df (patch) | |
| tree | ccf8b04671fbb36c108c8915d4f57014efcecc49 /build | |
| parent | d3a460865cf796b35cc9cf0e7e42781432a4138c (diff) | |
| download | pango-991d74a9947c050e12ca4f8509a05ddee6d0f3df.tar.gz | |
MSVC Builds: Cosmetics
Since we are no longer using the interim Makefile-msvcproj.am way to
generate the complete MSVC build files, change all PangoApiVersion to
ApiVersion, to be consistent with the other MSVC build files in the GTK+/
Clutter stack.
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/vs10/pango-install-bin.props | 10 | ||||
| -rw-r--r-- | build/win32/vs10/pango-install.propsin | 12 | ||||
| -rw-r--r-- | build/win32/vs10/pango-version-paths.props | 8 | ||||
| -rw-r--r-- | build/win32/vs10/pango.vcxprojin | 8 | ||||
| -rw-r--r-- | build/win32/vs10/pangocairo.vcxprojin | 22 | ||||
| -rw-r--r-- | build/win32/vs10/pangoft2.vcxprojin | 8 | ||||
| -rw-r--r-- | build/win32/vs10/pangowin32.vcxprojin | 8 | ||||
| -rw-r--r-- | build/win32/vs9/pango-install-bin.vsprops | 10 | ||||
| -rw-r--r-- | build/win32/vs9/pango-install.vspropsin | 12 | ||||
| -rw-r--r-- | build/win32/vs9/pango-version-paths.vsprops | 4 | ||||
| -rw-r--r-- | build/win32/vs9/pango.vcprojin | 8 | ||||
| -rw-r--r-- | build/win32/vs9/pangocairo.vcprojin | 22 | ||||
| -rw-r--r-- | build/win32/vs9/pangoft2.vcprojin | 8 | ||||
| -rw-r--r-- | build/win32/vs9/pangowin32.vcprojin | 8 |
14 files changed, 74 insertions, 74 deletions
diff --git a/build/win32/vs10/pango-install-bin.props b/build/win32/vs10/pango-install-bin.props index 5413766f..70c5b6ec 100644 --- a/build/win32/vs10/pango-install-bin.props +++ b/build/win32/vs10/pango-install-bin.props @@ -15,7 +15,7 @@ if "$(Configuration)" == "Debug_FC" goto DO_FC_BIN copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).dll $(CopyDir)\bin copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).pdb $(CopyDir)\bin -copy $(Configuration)\$(Platform)\bin\pango*-$(PangoApiVersion).lib $(CopyDir)\lib +copy $(Configuration)\$(Platform)\bin\pango*-$(ApiVersion).lib $(CopyDir)\lib goto DONE_BIN :DO_FC_BIN @@ -23,16 +23,16 @@ copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix) copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix).pdb $(CopyDir)\bin copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll $(CopyDir)\bin copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).pdb $(CopyDir)\bin -copy $(Configuration)\$(Platform)\bin\pangoft2-$(PangoApiVersion).lib $(CopyDir)\lib -copy $(Configuration)\$(Platform)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib +copy $(Configuration)\$(Platform)\bin\pangoft2-$(ApiVersion).lib $(CopyDir)\lib +copy $(Configuration)\$(Platform)\bin\pangocairo-$(ApiVersion).lib $(CopyDir)\lib if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).dll $(CopyDir)\bin if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).pdb $(CopyDir)\bin -if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\pango*-$(PangoApiVersion).lib $(CopyDir)\lib +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\pango*-$(ApiVersion).lib $(CopyDir)\lib if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).dll $(CopyDir)\bin if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).pdb $(CopyDir)\bin -if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\pango*-$(PangoApiVersion).lib $(CopyDir)\lib +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\pango*-$(ApiVersion).lib $(CopyDir)\lib :DONE_BIN diff --git a/build/win32/vs10/pango-install.propsin b/build/win32/vs10/pango-install.propsin index 4a04b516..60aca3c4 100644 --- a/build/win32/vs10/pango-install.propsin +++ b/build/win32/vs10/pango-install.propsin @@ -8,17 +8,17 @@ <InstalledDlls>$(BinDir)\$(PangoDllPrefix)pango(PangoDllSuffix).dll;$(BinDir)\$(PangoDllPrefix)pangowin32(PangoDllSuffix).dll;$(BinDir)\$(PangoDllPrefix)pangocairo(PangoDllSuffix).dll</InstalledDlls> <InstalledFCDlls>$(BinDir)\$(PangoDllPrefix)pangoft2(PangoDllSuffix).dll</InstalledFCDlls> <PangoInstallHeadersData> -mkdir $(CopyDir)\include\pango-$(PangoApiVersion)\pango +mkdir $(CopyDir)\include\pango-$(ApiVersion)\pango #include "pango.vs10.headers" if "$(Configuration)" == "Release" goto END if "$(Configuration)" == "Debug" goto END -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 -copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango -copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango +copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(ApiVersion)\pango +copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(ApiVersion)\pango :END </PangoInstallHeadersData> diff --git a/build/win32/vs10/pango-version-paths.props b/build/win32/vs10/pango-version-paths.props index 8027f816..9780f397 100644 --- a/build/win32/vs10/pango-version-paths.props +++ b/build/win32/vs10/pango-version-paths.props @@ -4,9 +4,9 @@ <VSVer>10</VSVer> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> - <PangoApiVersion>1.0</PangoApiVersion> + <ApiVersion>1.0</ApiVersion> <PangoLibtoolCompatibleDllPrefix>lib</PangoLibtoolCompatibleDllPrefix> - <PangoLibtoolCompatibleDllSuffix>-$(PangoApiVersion)-0</PangoLibtoolCompatibleDllSuffix> + <PangoLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</PangoLibtoolCompatibleDllSuffix> <PangoSeparateVSDllPrefix /> <PangoSeparateVSDllSuffix>-1-vs$(VSVer)</PangoSeparateVSDllSuffix> <PangoDllPrefix>$(PangoSeparateVSDllPrefix)</PangoDllPrefix> @@ -28,8 +28,8 @@ <BuildMacro Include="CopyDir"> <Value>$(CopyDir)</Value> </BuildMacro> - <BuildMacro Include="PangoApiVersion"> - <Value>$(PangoApiVersion)</Value> + <BuildMacro Include="ApiVersion"> + <Value>$(ApiVersion)</Value> </BuildMacro> <BuildMacro Include="PangoLibtoolCompatibleDllPrefix"> <Value>$(PangoLibtoolCompatibleDllPrefix)</Value> diff --git a/build/win32/vs10/pango.vcxprojin b/build/win32/vs10/pango.vcxprojin index 6e63f236..4b1ef8b2 100644 --- a/build/win32/vs10/pango.vcxprojin +++ b/build/win32/vs10/pango.vcxprojin @@ -89,7 +89,7 @@ <ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -109,7 +109,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -130,7 +130,7 @@ <ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -150,7 +150,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin index 23ce597d..3ce0effc 100644 --- a/build/win32/vs10/pangocairo.vcxprojin +++ b/build/win32/vs10/pangocairo.vcxprojin @@ -150,11 +150,11 @@ <Link> <AdditionalDependencies>cairo.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> - <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(PangoApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(ApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -171,13 +171,13 @@ <Link> <AdditionalDependencies>cairo.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> - <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(PangoApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(ApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -197,11 +197,11 @@ <Link> <AdditionalDependencies>cairo.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile> - <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(PangoApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>$(OutDir)pangoft2-$(ApiVersion).lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -223,7 +223,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -246,7 +246,7 @@ <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -268,7 +268,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -291,7 +291,7 @@ <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -313,7 +313,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin index ae87922f..d1b57868 100644 --- a/build/win32/vs10/pangoft2.vcxprojin +++ b/build/win32/vs10/pangoft2.vcxprojin @@ -91,7 +91,7 @@ <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -113,7 +113,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -136,7 +136,7 @@ <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -158,7 +158,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs10/pangowin32.vcxprojin b/build/win32/vs10/pangowin32.vcxprojin index ab58c27a..9af140e8 100644 --- a/build/win32/vs10/pangowin32.vcxprojin +++ b/build/win32/vs10/pangowin32.vcxprojin @@ -107,7 +107,7 @@ <ModuleDefinitionFile>..\..\..\pango\pangowin32.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -128,7 +128,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -150,7 +150,7 @@ <ModuleDefinitionFile>..\..\..\pango\pangowin32.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -171,7 +171,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <ImportLibrary>$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib</ImportLibrary> + <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/build/win32/vs9/pango-install-bin.vsprops b/build/win32/vs9/pango-install-bin.vsprops index 28a8cd0a..729762ee 100644 --- a/build/win32/vs9/pango-install-bin.vsprops +++ b/build/win32/vs9/pango-install-bin.vsprops @@ -16,7 +16,7 @@ if "$(ConfigurationName)" == "Debug_FC" goto DO_FC_BIN
 copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).dll $(CopyDir)\bin
 copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).pdb $(CopyDir)\bin
 -copy $(ConfigurationName)\$(PlatformName)\bin\pango*-$(PangoApiVersion).lib $(CopyDir)\lib
 +copy $(ConfigurationName)\$(PlatformName)\bin\pango*-$(ApiVersion).lib $(CopyDir)\lib
 goto DONE_BIN
 :DO_FC_BIN
 @@ -24,16 +24,16 @@ copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangoft2$(PangoDl copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix).pdb $(CopyDir)\bin
 copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll $(CopyDir)\bin
 copy $(ConfigurationName)\$(PlatformName)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).pdb $(CopyDir)\bin
 -copy $(ConfigurationName)\$(PlatformName)\bin\pangoft2-$(PangoApiVersion).lib $(CopyDir)\lib
 -copy $(ConfigurationName)\$(PlatformName)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib
 +copy $(ConfigurationName)\$(PlatformName)\bin\pangoft2-$(ApiVersion).lib $(CopyDir)\lib
 +copy $(ConfigurationName)\$(PlatformName)\bin\pangocairo-$(ApiVersion).lib $(CopyDir)\lib
 if "$(ConfigurationName)" == "Release_FC" copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).dll $(CopyDir)\bin
 if "$(ConfigurationName)" == "Release_FC" copy $(SolutionDir)\Release\$(PlatformName)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).pdb $(CopyDir)\bin
 -if "$(ConfigurationName)" == "Release_FC" copy $(SolutionDir)\Release\$(PlatformName)\bin\pango*-$(PangoApiVersion).lib $(CopyDir)\lib
 +if "$(ConfigurationName)" == "Release_FC" copy $(SolutionDir)\Release\$(PlatformName)\bin\pango*-$(ApiVersion).lib $(CopyDir)\lib
 if "$(ConfigurationName)" == "Debug_FC" copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).dll $(CopyDir)\bin
 if "$(ConfigurationName)" == "Debug_FC" copy $(SolutionDir)\Debug\$(PlatformName)\bin\$(PangoDllPrefix)pango*$(PangoDllSuffix).pdb $(CopyDir)\bin
 -if "$(ConfigurationName)" == "Debug_FC" copy $(SolutionDir)\Debug\$(PlatformName)\bin\pango*-$(PangoApiVersion).lib $(CopyDir)\lib
 +if "$(ConfigurationName)" == "Debug_FC" copy $(SolutionDir)\Debug\$(PlatformName)\bin\pango*-$(ApiVersion).lib $(CopyDir)\lib
 :DONE_BIN
 " diff --git a/build/win32/vs9/pango-install.vspropsin b/build/win32/vs9/pango-install.vspropsin index 531ce8e9..955e4a3f 100644 --- a/build/win32/vs9/pango-install.vspropsin +++ b/build/win32/vs9/pango-install.vspropsin @@ -8,17 +8,17 @@ <UserMacro Name="PangoInstallHeadersData" Value=" -mkdir $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 +mkdir $(CopyDir)\include\pango-$(ApiVersion)\pango
 #include "pango.headers" if "$(ConfigurationName)" == "Release" goto END
 if "$(ConfigurationName)" == "Debug" goto END
 -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
 -copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 -copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 +copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 +copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(ApiVersion)\pango
 :END
 " diff --git a/build/win32/vs9/pango-version-paths.vsprops b/build/win32/vs9/pango-version-paths.vsprops index 8555eaba..a40f4a21 100644 --- a/build/win32/vs9/pango-version-paths.vsprops +++ b/build/win32/vs9/pango-version-paths.vsprops @@ -17,7 +17,7 @@ Value="$(GlibEtcInstallRoot)" /> <UserMacro - Name="PangoApiVersion" + Name="ApiVersion" Value="1.0" /> <UserMacro @@ -26,7 +26,7 @@ /> <UserMacro Name="PangoLibtoolCompatibleDllSuffix" - Value="-$(PangoApiVersion)-0" + Value="-$(ApiVersion)-0" /> <UserMacro Name="PangoSeparateVSDllPrefix" diff --git a/build/win32/vs9/pango.vcprojin b/build/win32/vs9/pango.vcprojin index 1e2b8c68..f1a54e1f 100644 --- a/build/win32/vs9/pango.vcprojin +++ b/build/win32/vs9/pango.vcprojin @@ -44,7 +44,7 @@ ModuleDefinitionFile="..\..\..\pango\pango.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -74,7 +74,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -102,7 +102,7 @@ ModuleDefinitionFile="..\..\..\pango\pango.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> @@ -129,7 +129,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin index 570ad663..3ee818dc 100644 --- a/build/win32/vs9/pangocairo.vcprojin +++ b/build/win32/vs9/pangocairo.vcprojin @@ -46,7 +46,7 @@ ModuleDefinitionFile="..\..\..\pango\pangocairo.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -76,11 +76,11 @@ AdditionalDependencies="cairo.lib" OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll" LinkIncremental="2" - IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(PangoApiVersion).lib" + IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(ApiVersion).lib" ModuleDefinitionFile="..\..\..\pango\pangocairo.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -112,7 +112,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -139,13 +139,13 @@ AdditionalDependencies="cairo.lib" OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll" LinkIncremental="1" - IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(PangoApiVersion).lib" + IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(ApiVersion).lib" ModuleDefinitionFile="..\..\..\pango\pangocairo.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -175,7 +175,7 @@ ModuleDefinitionFile="..\..\..\pango\pangocairo.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> @@ -202,11 +202,11 @@ AdditionalDependencies="cairo.lib" OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll" LinkIncremental="2" - IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(PangoApiVersion).lib" + IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(ApiVersion).lib" ModuleDefinitionFile="..\..\..\pango\pangocairo.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> @@ -235,7 +235,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> @@ -264,7 +264,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin index 1868e9ec..a6570dd9 100644 --- a/build/win32/vs9/pangoft2.vcprojin +++ b/build/win32/vs9/pangoft2.vcprojin @@ -48,7 +48,7 @@ ModuleDefinitionFile="..\..\..\pango\pangoft2.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -80,7 +80,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -110,7 +110,7 @@ ModuleDefinitionFile="..\..\..\pango\pangoft2.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> @@ -139,7 +139,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> diff --git a/build/win32/vs9/pangowin32.vcprojin b/build/win32/vs9/pangowin32.vcprojin index aa38b1af..5baf7443 100644 --- a/build/win32/vs9/pangowin32.vcprojin +++ b/build/win32/vs9/pangowin32.vcprojin @@ -48,7 +48,7 @@ ModuleDefinitionFile="..\..\..\pango\pangowin32.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -80,7 +80,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> </Configuration> @@ -109,7 +109,7 @@ ModuleDefinitionFile="..\..\..\pango\pangowin32.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> @@ -138,7 +138,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> </Configuration> |