Visual C++ Builds: Use Custom Build Rules

...so that the gdk-pixbuf.def can be automatically updated upon build when
gdk-pixbuf.symbols is updated, and that it could be deleted upon a "clean"
request.

Also drop some unneeded items from the property sheets and fix a typo.

3 files changed, 42 insertions, 51 deletions

diff --git a/build/win32/vs10/gdk-pixbuf.props b/build/win32/vs10/gdk-pixbuf.props
index 29369a740..0b85e2d73 100644
--- a/build/win32/vs10/gdk-pixbuf.props
+++ b/build/win32/vs10/gdk-pixbuf.props
@@ -2,8 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <VSVer>10</VSVer>
-    <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <ApiVersion>2.0</ApiVersion>
     <GdkPixbufBinaryVersion>2.10.0</GdkPixbufBinaryVersion>
@@ -65,7 +64,7 @@ copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\\lib
 set VSVER=$(VSVer)
 set CONF=$(Configuration)
 set PLAT=$(Platform)
-set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
+set BASEDIR=$(GlibEtcInstallRoot)
 cd ..
 call gengir_gdkpixbuf.bat
 
@@ -96,25 +95,12 @@ cd vs$(VSVer)
     </Link>
     <PreBuildEvent>
       <Command>
-if exist ..\..\..\config.h goto GEN_MARS_H
+if exist ..\..\..\config.h goto DONE_CONFIG_H
 
 copy ..\..\..\config.h.win32 ..\..\..\config.h
 
-:GEN_MARS_H
-
-if exist ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h goto GEN_MARS_C
-
-glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.list --header &gt;..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h
-
-:GEN_MARS_C
-
-if exist ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.c goto END
-
-glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.list --body &gt;..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.c
-
-:END
-
-</Command>
+:DONE_CONFIG_H
+      </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -124,9 +110,6 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
     <BuildMacro Include="GlibEtcInstallRoot">
       <Value>$(GlibEtcInstallRoot)</Value>
     </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
-      <Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
-    </BuildMacro>
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
@@ -194,4 +177,4 @@ glib-genmarshal.exe --prefix=_gdk_pixbuf_marshal ..\..\..\gdk-pixbuf\gdk-pixbuf-
       <Value>$(DefDir)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf.vcxproj.filtersin b/build/win32/vs10/gdk-pixbuf.vcxproj.filtersin
index 022f918cf..613c6f2c8 100644
--- a/build/win32/vs10/gdk-pixbuf.vcxproj.filtersin
+++ b/build/win32/vs10/gdk-pixbuf.vcxproj.filtersin
@@ -15,7 +15,7 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resouce Files">
+    <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
     </Filter>
@@ -53,6 +53,10 @@
     <ClCompile Include="..\..\..\gdk-pixbuf\io-jpeg.c"><Filter>Source Files\Non-Native</Filter></ClCompile>
     <ClCompile Include="..\..\..\gdk-pixbuf\io-tiff.c"><Filter>Source Files\Non-Native</Filter></ClCompile>
   </ItemGroup>
-  <ItemGroup><ResourceCompile Include="..\..\..\gdk-pixbuf\gdk_pixbuf.rc"><Filter>Resouce Files</Filter></ResourceCompile>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gdk-pixbuf\gdk_pixbuf.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gdk-pixbuf.vcxprojin b/build/win32/vs10/gdk-pixbuf.vcxprojin
index 544b06092..59ac99af2 100644
--- a/build/win32/vs10/gdk-pixbuf.vcxprojin
+++ b/build/win32/vs10/gdk-pixbuf.vcxprojin
@@ -144,9 +144,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng16d.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -173,9 +170,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng16.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -204,9 +198,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng16d.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -226,9 +217,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>Gdiplus.lib;libpng16.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -255,9 +243,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libpng16d.lib;zlib1d.lib;intld.lib;libjpegd.lib;libjasper.lib;libtiffd_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -285,9 +270,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libpng16.lib;zlib1.lib;intl.lib;libjpeg.lib;libjasper.lib;libtiff_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -317,9 +299,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libpng16d.lib;zlib1d.lib;intld.lib;libjpegd.lib;libjasper.lib;libtiffd_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -340,9 +319,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GdkPixbufGenerateGdkPixbufDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libpng16.lib;zlib1.lib;intl.lib;libjpeg.lib;libjasper.lib;libtiff_i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
@@ -465,9 +441,37 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoGDIP|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|Win32'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">Generating gdk-pixbuf.def...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">$(GdkPixbufGenerateGdkPixbufDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_NoGDIP|x64'">$(IntDir)gdk-pixbuf.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ResourceCompile Include="..\..\..\gdk-pixbuf\gdk_pixbuf.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>