[gdk-pixbuf] Visual Studio builds: Have package version available in projects

[Chun-wei Fan <fanchunwei src gnome org>]

commit b5872aaade083987836d951391fdc21e030038b3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Apr 22 17:38:54 2016 +0800

    Visual Studio builds: Have package version available in projects
    
    This is to make generating .pc files for the package easier for Visual
    Studio builds.  Also make GlibEtcInstallRoot more consistent across the
    board, and add setting entries for installation path to the Python
    interpretor, also to make things easier for generating .pc files, as well
    as building the introspection files.

 ...ths.props => gdk-pixbuf-version-paths.props.in} |   32 ++++++++++++++++----
 ...vsprops => gdk-pixbuf-version-paths.vsprops.in} |   30 +++++++++++++++---
 configure.ac                                       |    2 +
 3 files changed, 53 insertions(+), 11 deletions(-)
---
diff --git a/build/win32/vs10/gdk-pixbuf-version-paths.props 
b/build/win32/vs10/gdk-pixbuf-version-paths.props.in
similarity index 73%
rename from build/win32/vs10/gdk-pixbuf-version-paths.props
rename to build/win32/vs10/gdk-pixbuf-version-paths.props.in
index 33aee7e..59200f6 100644
--- a/build/win32/vs10/gdk-pixbuf-version-paths.props
+++ b/build/win32/vs10/gdk-pixbuf-version-paths.props.in
@@ -2,16 +2,21 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup Label="UserMacros">
     <VSVer>10</VSVer>
+    <GdkPixbufMajorVersion>@GDK_PIXBUF_MAJOR@</GdkPixbufMajorVersion>
+    <GdkPixbufMinorVersion>@GDK_PIXBUF_MINOR@</GdkPixbufMinorVersion>
+    <GdkPixbufMicroVersion>@GDK_PIXBUF_MICRO@</GdkPixbufMicroVersion>
+    <ApiVersion>2.0</ApiVersion>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <ApiVersion>2.0</ApiVersion>
+    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
     <GdkPixbufLibtoolCompatibleDllPrefix>lib</GdkPixbufLibtoolCompatibleDllPrefix>
     <GdkPixbufLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GdkPixbufLibtoolCompatibleDllSuffix>
     <GdkPixbufSeparateVSDllPrefix />
     <GdkPixbufSeparateVSDllSuffix>-2-vs$(VSVer)</GdkPixbufSeparateVSDllSuffix>
     <GdkPixbufDllPrefix>$(GdkPixbufSeparateVSDllPrefix)</GdkPixbufDllPrefix>
     <GdkPixbufDllSuffix>$(GdkPixbufSeparateVSDllSuffix)</GdkPixbufDllSuffix>
-    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
+    <PythonPath>c:\python34</PythonPath>
+    <PythonPathX64>$(PythonPath).x64</PythonPathX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gdk-versionpathsprops</_PropertySheetDisplayName>
@@ -20,14 +25,26 @@
     <BuildMacro Include="VSVer">
       <Value>$(VSVer)</Value>
     </BuildMacro>
+    <BuildMacro Include="GdkPixbufMajorVersion">
+      <Value>$(GdkPixbufMajorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufMinorVersion">
+      <Value>$(GdkPixbufMinorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufMicroVersion">
+      <Value>$(GdkPixbufMicroVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ApiVersion">
+      <Value>$(ApiVersion)</Value>
+    </BuildMacro>
     <BuildMacro Include="GlibEtcInstallRoot">
       <Value>$(GlibEtcInstallRoot)</Value>
     </BuildMacro>
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
     </BuildMacro>
     <BuildMacro Include="GdkPixbufLibtoolCompatibleDllPrefix">
       <Value>$(GdkPixbufLibtoolCompatibleDllPrefix)</Value>
@@ -47,8 +64,11 @@
     <BuildMacro Include="GdkPixbufDllSuffix">
       <Value>$(GdkPixbufDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="DefDir">
-      <Value>$(DefDir)</Value>
+    <BuildMacro Include="PythonPath">
+      <Value>$(PythonPath)</Value>
+    </BuildMacro>
+    <BuildMacro Include="PythonPathX64">
+      <Value>$(PythonPathX64)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/win32/vs9/gdk-pixbuf-version-paths.vsprops 
b/build/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
similarity index 72%
rename from build/win32/vs9/gdk-pixbuf-version-paths.vsprops
rename to build/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
index 1f167bd..84b3ec7 100644
--- a/build/win32/vs9/gdk-pixbuf-version-paths.vsprops
+++ b/build/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
@@ -9,8 +9,24 @@
                Value="9"
        />
        <UserMacro
+               Name="GdkPixbufMajorVersion"
+               Value="@GDK_PIXBUF_MAJOR@"
+       />
+       <UserMacro
+               Name="GdkPixbufMinorVersion"
+               Value="@GDK_PIXBUF_MINOR@"
+       />
+       <UserMacro
+               Name="GdkPixbufMicroVersion"
+               Value="@GDK_PIXBUF_MICRO@"
+       />
+       <UserMacro
+               Name="ApiVersion"
+               Value="2.0"
+       />
+       <UserMacro
                Name="GlibEtcInstallRoot"
-               Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+               Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
        />
        <UserMacro
                Name="DefDir"
@@ -21,10 +37,6 @@
                Value="$(GlibEtcInstallRoot)"
        />
        <UserMacro
-               Name="ApiVersion"
-               Value="2.0"
-       />
-       <UserMacro
                Name="GdkPixbufLibtoolCompatibleDllPrefix"
                Value="lib"
        />
@@ -50,4 +62,12 @@
                Name="GdkPixbufDllSuffix"
                Value="$(GdkPixbufSeparateVSDllSuffix)"
        />
+       <UserMacro
+               Name="PythonPath"
+               Value="c:\python27"
+       />
+       <UserMacro
+               Name="PythonPathX64"
+               Value="$(PythonPath).x64"
+       />
 </VisualStudioPropertySheet>
diff --git a/configure.ac b/configure.ac
index 4e5277c..2c358b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1076,7 +1076,9 @@ gdk-pixbuf/pixops/Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
+build/win32/vs9/gdk-pixbuf-version-paths.vsprops
 build/win32/vs10/Makefile
+build/win32/vs10/gdk-pixbuf-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile