[gtk+/gtk-2-24] Clean Up MSVC Project Generation



commit 339fd3d3f6e81c06d8f2797840301ddf15db5a88
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Dec 15 16:44:47 2015 +0800

    Clean Up MSVC Project Generation
    
    Use the common autotools module that was added in the last commit so that
    we can clean up the various Makefile.am's in gdk/ and gtk/, and also
    make more Visual Studio projects completed during 'make dist', by adding
    minimal items to those other Makefile.am's.  This also allows us to make
    the property sheets that does the copying of headers and built items
    completed at 'make dist', so that we won't have to worry too much about
    headers being added (although it would be unlikely for GTK+-2.x).

 build/win32/vs10/Makefile.am                       |   48 ++-
 ....vcxproj.filters => gailutil.vcxproj.filtersin} |    3 +-
 .../vs10/{gailutil.vcxproj => gailutil.vcxprojin}  |    3 +-
 build/win32/vs10/gdk-win32.vcxproj.filters         |   49 ---
 ...vcxproj.filters => gdk-win32.vcxproj.filtersin} |   19 +-
 .../{gdk-win32.vcxproj => gdk-win32.vcxprojin}     |   27 +--
 build/win32/vs10/gdk.vcxproj.filtersin             |    2 +-
 build/win32/vs10/gdk.vcxprojin                     |    2 +-
 build/win32/vs10/gtk-demo.vcxproj.filters          |   54 ----
 build/win32/vs10/gtk-demo.vcxproj.filtersin        |   16 +
 .../vs10/{gtk-demo.vcxproj => gtk-demo.vcxprojin}  |   40 +---
 build/win32/vs10/gtk-install.props                 |  327 --------------------
 build/win32/vs10/gtk-install.propsin               |   80 +++++
 build/win32/vs10/gtk.vcxproj.filtersin             |    2 +-
 build/win32/vs10/gtk.vcxprojin                     |    2 +-
 ...p.vcxproj.filters => libwimp.vcxproj.filtersin} |    1 +
 .../vs10/{libwimp.vcxproj => libwimp.vcxprojin}    |    5 +-
 build/win32/vs9/Makefile.am                        |   33 ++-
 .../vs9/{gailutil.vcproj => gailutil.vcprojin}     |    3 +-
 .../vs9/{gdk-win32.vcproj => gdk-win32.vcprojin}   |   27 +--
 build/win32/vs9/gdk.vcprojin                       |    2 +-
 build/win32/vs9/gtk-demo.vcproj                    |  212 -------------
 .../vs9/{libwimp.vcproj => gtk-demo.vcprojin}      |  105 ++++---
 build/win32/vs9/gtk-install.vsprops                |  310 -------------------
 build/win32/vs9/gtk-install.vspropsin              |   62 ++++
 build/win32/vs9/gtk.vcprojin                       |    2 +-
 .../win32/vs9/{libwimp.vcproj => libwimp.vcprojin} |    5 +-
 demos/gtk-demo/Makefile.am                         |   10 +
 gdk/Makefile.am                                    |   44 +--
 gdk/win32/Makefile.am                              |   14 +
 gtk/Makefile.am                                    |   44 +--
 modules/engines/ms-windows/Makefile.am             |   10 +
 modules/other/gail/libgail-util/Makefile.am        |   14 +
 33 files changed, 370 insertions(+), 1207 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 393d25d..d227244 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,26 +1,46 @@
 include $(top_srcdir)/Makefile.decl
 
+GENERATED_ITEMS = \
+       gdk-win32.vcxproj       \
+       gdk.vcxproj             \
+       gtk.vcxproj             \
+       gailutil.vcxproj        \
+       libwimp.vcxproj         \
+       gtk-demo.vcxproj        \
+       gdk-win32.vcxproj.filters       \
+       gdk.vcxproj.filters     \
+       gtk.vcxproj.filters     \
+       gailutil.vcxproj.filters        \
+       libwimp.vcxproj.filters \
+       gtk-demo.vcxproj.filters        \
+       gtk-install.props
+
 EXTRA_DIST +=  \
        README.txt      \
        gtk+.sln        \
        gtk-build-defines.props \
        gtk-gen-srcs.props      \
-       gtk-install.props       \
+       gtk-install.propsin     \
        gtk-version-paths.props \
-       gdk-win32.vcxproj       \
-       gdk-win32.vcxproj.filters       \
-       gdk.vcxproj     \
+       gdk-win32.vcxprojin     \
+       gdk-win32.vcxproj.filtersin     \
        gdk.vcxprojin   \
-       gdk.vcxproj.filters     \
        gdk.vcxproj.filtersin   \
-       gtk.vcxproj     \
        gtk.vcxprojin   \
-       gtk.vcxproj.filters     \
        gtk.vcxproj.filtersin   \
-       gtk-demo.vcxproj        \
-       gtk-demo.vcxproj.filters        \
-       gailutil.vcxproj        \
-       gailutil.vcxproj.filters        \
-       libwimp.vcxproj \
-       libwimp.vcxproj.filters \
-       gtk-install.vcxproj
+       gtk-demo.vcxprojin      \
+       gtk-demo.vcxproj.filtersin      \
+       gailutil.vcxprojin      \
+       gailutil.vcxproj.filtersin      \
+       libwimp.vcxprojin       \
+       libwimp.vcxproj.filtersin       \
+       gtk-install.vcxproj     \
+       $(GENERATED_ITEMS)
+
+MSVC_INTERMEDIATE_FILES = gdk-win32.vs10.headers gdk.vs10.headers gtk.vs10.headers gailutil.vs10.headers
+
+gtk-install.props: $(MSVC_INTERMEDIATE_FILES)
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk-install.propsin >$@
+       rm $(MSVC_INTERMEDIATE_FILES)
+
+DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs10/gailutil.vcxproj.filters b/build/win32/vs10/gailutil.vcxproj.filtersin
similarity index 77%
copy from build/win32/vs10/gailutil.vcxproj.filters
copy to build/win32/vs10/gailutil.vcxproj.filtersin
index ba85d8a..325301a 100644
--- a/build/win32/vs10/gailutil.vcxproj.filters
+++ b/build/win32/vs10/gailutil.vcxproj.filtersin
@@ -15,7 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile 
Include="..\..\..\modules\other\gail\libgail-util\gailmisc.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile 
Include="..\..\..\modules\other\gail\libgail-util\gailtextutil.c"><Filter>Sources</Filter></ClCompile>
+#include "gailutil.vs10.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gailutil.vcxproj b/build/win32/vs10/gailutil.vcxprojin
similarity index 98%
rename from build/win32/vs10/gailutil.vcxproj
rename to build/win32/vs10/gailutil.vcxprojin
index 7de4ef7..63ea709 100644
--- a/build/win32/vs10/gailutil.vcxproj
+++ b/build/win32/vs10/gailutil.vcxprojin
@@ -169,8 +169,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\modules\other\gail\libgail-util\gailmisc.c" />
-    <ClCompile Include="..\..\..\modules\other\gail\libgail-util\gailtextutil.c" />
+#include "gailutil.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
diff --git a/build/win32/vs10/gailutil.vcxproj.filters b/build/win32/vs10/gdk-win32.vcxproj.filtersin
similarity index 65%
rename from build/win32/vs10/gailutil.vcxproj.filters
rename to build/win32/vs10/gdk-win32.vcxproj.filtersin
index ba85d8a..c69e905 100644
--- a/build/win32/vs10/gailutil.vcxproj.filters
+++ b/build/win32/vs10/gdk-win32.vcxproj.filtersin
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
     <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;tiff;tif;png;wav</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile 
Include="..\..\..\modules\other\gail\libgail-util\gailmisc.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile 
Include="..\..\..\modules\other\gail\libgail-util\gailtextutil.c"><Filter>Sources</Filter></ClCompile>
+#include "gdk-win32.vs10.sourcefiles.filters"
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk-win32.vcxproj b/build/win32/vs10/gdk-win32.vcxprojin
similarity index 85%
rename from build/win32/vs10/gdk-win32.vcxproj
rename to build/win32/vs10/gdk-win32.vcxprojin
index 0564ab3..693b6ad 100644
--- a/build/win32/vs10/gdk-win32.vcxproj
+++ b/build/win32/vs10/gdk-win32.vcxprojin
@@ -115,32 +115,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gdk\win32\gdkapplaunchcontext-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkcolor-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkcursor-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkdisplay-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkdnd-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkdrawable-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkevents-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkfont-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkgc-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkgeometry-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkglobals-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkim-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkimage-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkinput-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkinput.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkkeys-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkmain-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkpixmap-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkproperty-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkscreen-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkselection-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkspawn-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdktestutils-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkvisual-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkwin32id.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkwindow-win32.c" />
+#include "gdk-win32.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32">
diff --git a/build/win32/vs10/gdk.vcxproj.filtersin b/build/win32/vs10/gdk.vcxproj.filtersin
index 04aba15..647760e 100644
--- a/build/win32/vs10/gdk.vcxproj.filtersin
+++ b/build/win32/vs10/gdk.vcxproj.filtersin
@@ -20,7 +20,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-#include "libgdk.vs10.sourcefiles.filters"
+#include "gdk.vs10.sourcefiles.filters"
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\gdk\gdk.symbols">
diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin
index 7d8af9c..0bbcb62 100644
--- a/build/win32/vs10/gdk.vcxprojin
+++ b/build/win32/vs10/gdk.vcxprojin
@@ -184,7 +184,7 @@
     <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
   </ItemGroup>
   <ItemGroup>
-#include "libgdk.vs10.sourcefiles"
+#include "gdk.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-win32.vcxproj">
diff --git a/build/win32/vs10/gtk-demo.vcxproj.filtersin b/build/win32/vs10/gtk-demo.vcxproj.filtersin
new file mode 100644
index 0000000..86bcbe2
--- /dev/null
+++ b/build/win32/vs10/gtk-demo.vcxproj.filtersin
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+#include "gtk-demo.vs10.sourcefiles.filters"
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/gtk-demo.vcxproj b/build/win32/vs10/gtk-demo.vcxprojin
similarity index 79%
rename from build/win32/vs10/gtk-demo.vcxproj
rename to build/win32/vs10/gtk-demo.vcxprojin
index 20418b1..7eb809c 100644
--- a/build/win32/vs10/gtk-demo.vcxproj
+++ b/build/win32/vs10/gtk-demo.vcxprojin
@@ -167,45 +167,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\builder.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\button_box.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\changedisplay.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\clipboard.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\colorsel.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\iconview_edit.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\images.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\links.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\printing.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\stock_browser.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.c" />
+#include "gtk-demo.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
diff --git a/build/win32/vs10/gtk-install.propsin b/build/win32/vs10/gtk-install.propsin
new file mode 100644
index 0000000..f466787
--- /dev/null
+++ b/build/win32/vs10/gtk-install.propsin
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    
<InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk-win32(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk-win32(GtkDllSuffix).dll;$(BinDir)\libwimp.dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\gtk-demo.exe</InstalledBins>
+    <GtkDoInstall>
+mkdir $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk-demo.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk-demo.pdb" $(CopyDir)\bin
+
+mkdir $(CopyDir)\lib
+copy "$(BinDir)\gdk-win32-$(ApiVersion).lib" $(CopyDir)\lib
+copy "$(BinDir)\gtk-win32-$(ApiVersion).lib" $(CopyDir)\lib
+copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+#include "gdk.vs10.headers"
+#include "gdk-win32.vs10.headers"
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+#include "gtk.vs10.headers"
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\include
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\lib\gtk-$(ApiVersion)\include
+
+mkdir $(CopyDir)\include\gail-1.0\libgail-util
+#include "gailutil.vs10.headers"
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines
+copy "$(BinDir)\libwimp.dll" $(CopyDir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines
+
+mkdir $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+mkdir $(CopyDir)\share\themes\Default\gtk-2.0-key
+copy ..\..\..\gtk\gtkrc.key.default $(CopyDir)\share\themes\Default\gtk-2.0-key\gtkrc
+
+mkdir $(CopyDir)\share\themes\Emacs\gtk-2.0-key
+copy ..\..\..\gtk\gtkrc.key.emacs $(CopyDir)\share\themes\Emacs\gtk-2.0-key\gtkrc
+
+mkdir $(CopyDir)\share\themes\MS-Windows\gtk-2.0
+copy ..\..\..\modules\engines\ms-windows\Theme\gtk-2.0\gtkrc $(CopyDir)\share\themes\MS-Windows\gtk-2.0
+
+mkdir $(CopyDir)\share\themes\Raleigh\gtk-2.0
+copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-2.0\gtkrc
+</GtkDoInstall>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gtkinstallprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="BinDir">
+      <Value>$(BinDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledDlls">
+      <Value>$(InstalledDlls)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBins">
+      <Value>$(InstalledBins)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDoInstall">
+      <Value>$(GtkDoInstall)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/gtk.vcxproj.filtersin b/build/win32/vs10/gtk.vcxproj.filtersin
index a916f94..1298e36 100644
--- a/build/win32/vs10/gtk.vcxproj.filtersin
+++ b/build/win32/vs10/gtk.vcxproj.filtersin
@@ -18,7 +18,7 @@
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-#include "libgtk.vs10.sourcefiles.filters"
+#include "gtk.vs10.sourcefiles.filters"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source 
Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index b49831d..7611d8b 100644
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -184,7 +184,7 @@
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
   </ItemGroup>
   <ItemGroup>
-#include "libgtk.vs10.sourcefiles"
+#include "gtk.vs10.sourcefiles"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
     <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
     <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
diff --git a/build/win32/vs10/libwimp.vcxproj.filters b/build/win32/vs10/libwimp.vcxproj.filtersin
similarity index 96%
rename from build/win32/vs10/libwimp.vcxproj.filters
rename to build/win32/vs10/libwimp.vcxproj.filtersin
index e04e9cd..fb1a3c7 100644
--- a/build/win32/vs10/libwimp.vcxproj.filters
+++ b/build/win32/vs10/libwimp.vcxproj.filtersin
@@ -15,6 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+#include "libwimp.vs10.sourcefiles.filters"
     <ClCompile 
Include="..\..\..\modules\engines\ms-windows\msw_rc_style.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_style.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile 
Include="..\..\..\modules\engines\ms-windows\msw_theme_main.c"><Filter>Sources</Filter></ClCompile>
diff --git a/build/win32/vs10/libwimp.vcxproj b/build/win32/vs10/libwimp.vcxprojin
similarity index 96%
rename from build/win32/vs10/libwimp.vcxproj
rename to build/win32/vs10/libwimp.vcxprojin
index 30e3de3..ac1b9e3 100644
--- a/build/win32/vs10/libwimp.vcxproj
+++ b/build/win32/vs10/libwimp.vcxprojin
@@ -153,10 +153,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_rc_style.c" />
-    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_style.c" />
-    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_theme_main.c" />
-    <ClCompile Include="..\..\..\modules\engines\ms-windows\xp_theme.c" />
+#include "libwimp.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 0c870bf..eb345e8 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,18 +1,35 @@
 include $(top_srcdir)/Makefile.decl
 
+GENERATED_ITEMS = \
+       gdk-win32.vcproj        \
+       gdk.vcproj      \
+       gtk.vcproj      \
+       gailutil.vcproj \
+       gtk-demo.vcproj \
+       libwimp.vcproj  \
+       gtk-install.vsprops
+
 EXTRA_DIST +=  \
        README.txt      \
        gtk+.sln        \
        gtk-build-defines.vsprops       \
        gtk-gen-srcs.vsprops    \
-       gtk-install.vsprops     \
+       gtk-install.vspropsin   \
        gtk-version-paths.vsprops       \
-       gdk-win32.vcproj        \
-       gdk.vcproj      \
+       gdk-win32.vcprojin      \
        gdk.vcprojin    \
-       gtk.vcproj      \
        gtk.vcprojin    \
-       gtk-demo.vcproj \
-       gailutil.vcproj \
-       libwimp.vcproj  \
-       gtk-install.vcproj
+       gtk-demo.vcprojin       \
+       gailutil.vcprojin       \
+       libwimp.vcprojin        \
+       gtk-install.vcproj      \
+       $(GENERATED_ITEMS)
+
+MSVC_INTERMEDIATE_FILES = gdk-win32.headers gdk.headers gtk.headers gailutil.headers
+
+gtk-install.vsprops: $(MSVC_INTERMEDIATE_FILES)
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk-install.vspropsin >$@
+       rm $(MSVC_INTERMEDIATE_FILES)
+
+DISTCLEANFILES = $(GENERATED_ITEMS)
+
diff --git a/build/win32/vs9/gailutil.vcproj b/build/win32/vs9/gailutil.vcprojin
similarity index 96%
rename from build/win32/vs9/gailutil.vcproj
rename to build/win32/vs9/gailutil.vcprojin
index 521cd87..1526b19 100644
--- a/build/win32/vs9/gailutil.vcproj
+++ b/build/win32/vs9/gailutil.vcprojin
@@ -162,8 +162,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\other\gail\libgail-util\gailmisc.c" />
-                       <File RelativePath="..\..\..\modules\other\gail\libgail-util\gailtextutil.c" />
+#include "gailutil.sourcefiles"
                </Filter>
                <Filter
                        Name="Headers"
diff --git a/build/win32/vs9/gdk-win32.vcproj b/build/win32/vs9/gdk-win32.vcprojin
similarity index 76%
rename from build/win32/vs9/gdk-win32.vcproj
rename to build/win32/vs9/gdk-win32.vcprojin
index 54e7a85..a083b16 100644
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcprojin
@@ -182,32 +182,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\gdk\win32\gdkapplaunchcontext-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkcolor-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkcursor-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkdisplay-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkdnd-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkdrawable-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkevents-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkfont-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkgc-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkimage-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkmain-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkpixmap-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkproperty-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkscreen-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkspawn-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
-                       <File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
+#include "gdk-win32.sourcefiles"
                </Filter>
        </Files>
 </VisualStudioProject>
diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index 28b5621..3c51cf1 100644
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -215,7 +215,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-#include "libgdk.sourcefiles"
+#include "gdk.sourcefiles"
                </Filter>
        </Files>
 </VisualStudioProject>
diff --git a/build/win32/vs9/libwimp.vcproj b/build/win32/vs9/gtk-demo.vcprojin
similarity index 65%
copy from build/win32/vs9/libwimp.vcproj
copy to build/win32/vs9/gtk-demo.vcprojin
index 5fa5aad..8076d55 100644
--- a/build/win32/vs9/libwimp.vcproj
+++ b/build/win32/vs9/gtk-demo.vcprojin
@@ -2,11 +2,11 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9.00"
-       Name="libwimp"
-       ProjectGUID="{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
-       RootNamespace="libwimp"
+       Name="gtk-demo"
+       ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+       RootNamespace="gtkdemo"
        Keyword="Win32Proj"
-       TargetFrameworkVersion="196613"
+       TargetFrameworkVersion="131072"
        >
        <Platforms>
                <Platform
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       ConfigurationType="2"
+                       ConfigurationType="1"
                        InheritedPropertySheets=".\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        >
@@ -30,8 +30,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
                                Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
                                PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -39,105 +39,115 @@
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="4"
+                               CompileAs="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+                               AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
-                               SubSystem="2"
+                               SubSystem="1"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
-                       ConfigurationType="2"
+                       Name="Debug|x64"
+                       ConfigurationType="1"
                        InheritedPropertySheets=".\gtk-build-defines.vsprops"
                        CharacterSet="2"
-                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-                               Optimization="2"
-                               EnableIntrinsicFunctions="true"
-                               PreprocessorDefinitions=""
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+                               PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="3"
+                               CompileAs="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
-                               LinkIncremental="1"
+                               AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+                               LinkIncremental="2"
                                GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
+                               SubSystem="1"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               TargetMachine="17"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
+                       ConfigurationType="1"
                        InheritedPropertySheets=".\gtk-build-defines.vsprops"
-                       ConfigurationType="2"
                        CharacterSet="2"
+                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-                               PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+                               PreprocessorDefinitions=""
+                               RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="3"
+                               CompileAs="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
-                               LinkIncremental="2"
+                               AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+                               LinkIncremental="1"
                                GenerateDebugInformation="true"
-                               SubSystem="2"
-                               TargetMachine="17"
+                               SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
+                       ConfigurationType="1"
                        InheritedPropertySheets=".\gtk-build-defines.vsprops"
-                       ConfigurationType="2"
                        CharacterSet="2"
+                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+                               AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="3"
+                               CompileAs="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
-                               LinkIncremental="2"
+                               AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+                               LinkIncremental="1"
                                GenerateDebugInformation="true"
-                               SubSystem="2"
+                               SubSystem="1"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                TargetMachine="17"
                        />
                </Configuration>
@@ -146,27 +156,18 @@
        </References>
        <Files>
                <Filter
-                       Name="Sources"
+                       Name="Source Files"
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\msw_rc_style.c" />
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\msw_style.c" />
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\msw_theme_main.c" />
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\xp_theme.c" />
+#include "gtk-demo.sourcefiles"
                </Filter>
                <Filter
-                       Name="Headers"
+                       Name="Header Files"
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                </Filter>
-               <Filter
-                       Name="Resource Files"
-                       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}"
-                       >
-               </Filter>
        </Files>
        <Globals>
        </Globals>
diff --git a/build/win32/vs9/gtk-install.vspropsin b/build/win32/vs9/gtk-install.vspropsin
new file mode 100644
index 0000000..246cc87
--- /dev/null
+++ b/build/win32/vs9/gtk-install.vspropsin
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="gtkinstallprops"
+       InheritedPropertySheets=".\gtk-build-defines.vsprops"
+       >
+       <UserMacro
+               Name="GtkDoInstall"
+               Value="
+mkdir $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).dll 
$(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).pdb 
$(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).dll 
$(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).pdb 
$(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll 
$(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb 
$(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gdk-win32-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-win32-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+#include "gdk.headers"
+#include "gdk-win32.headers"
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+#include "gtk.headers"
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\include&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\lib\gtk-$(ApiVersion)\include&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\gail-1.0\libgail-util&#x0D;&#x0A;
+#include "gailutil.headers"
+
+copy $(ConfigurationName)\$(PlatformName)\bin\libwimp.dll 
$(Outdir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\Default\gtk-$(ApiVersion)-key&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.key.default $(CopyDir)\share\themes\Default\gtk-$(ApiVersion)-key\gtkrc&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\Emacs\gtk-$(ApiVersion)-key&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.key.emacs $(CopyDir)\share\themes\Emacs\gtk-$(ApiVersion)-key\gtkrc&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\MS-Windows\gtk-$(ApiVersion)&#x0D;&#x0A;
+copy ..\..\..\modules\engines\ms-windows\Theme\gtk-$(ApiVersion)\gtkrc 
$(CopyDir)\share\themes\MS-Windows\gtk-$(ApiVersion)&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\Raleigh\gtk-$(ApiVersion)&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-$(ApiVersion)\gtkrc&#x0D;&#x0A;
+                     "
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 9426966..c22e7a2 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -215,7 +215,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-#include "libgtk.sourcefiles"
+#include "gtk.sourcefiles"
                        <File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
                        <File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
                        <File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
diff --git a/build/win32/vs9/libwimp.vcproj b/build/win32/vs9/libwimp.vcprojin
similarity index 93%
rename from build/win32/vs9/libwimp.vcproj
rename to build/win32/vs9/libwimp.vcprojin
index 5fa5aad..8cc2c05 100644
--- a/build/win32/vs9/libwimp.vcproj
+++ b/build/win32/vs9/libwimp.vcprojin
@@ -150,10 +150,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\msw_rc_style.c" />
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\msw_style.c" />
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\msw_theme_main.c" />
-                       <File RelativePath="..\..\..\modules\engines\ms-windows\xp_theme.c" />
+#include "libwimp.sourcefiles"
                </Filter>
                <Filter
                        Name="Headers"
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index cf4434e..61b5578 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -102,6 +102,16 @@ IMAGEFILES=        alphatest.png           \
 
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
+# ------------------- MSVC Projects --------------------
+MSVCPROJS = gtk-demo
+
+gtk_demo_FILES = $(gtk_demo_SOURCES)
+gtk_demo_EXCLUDES = gtkdemodummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(top_builddir)/build/win32/vs9/gtk-demo.vcproj
+
 DISTCLEANFILES = demos.h
 
 -include $(top_srcdir)/git.mk
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index bccd7b8..4d606e0 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -368,37 +368,19 @@ stamp-gc-h: $(top_builddir)/config.status
        cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
        echo timestamp > stamp-gc-h
 
-dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj 
../build/win32/vs10/gdk.vcxproj.filters
-
-../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
-       for F in $(libgdk_win32_2_0_la_SOURCES); do \
-               case $$F in \
-               *.c) echo '   <File RelativePath="..\..\..\gdk\'$$F'" />' \
-                    ;; \
-               esac; \
-       done >libgdk.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@
-       rm libgdk.sourcefiles
-       
-../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin
-       for F in $(libgdk_win32_2_0_la_SOURCES); do \
-               case $$F in \
-               *.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'" />' \
-                    ;; \
-               esac; \
-       done >libgdk.vs10.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxprojin >$@
-       rm libgdk.vs10.sourcefiles
-       
-../build/win32/vs10/gdk.vcxproj.filters: ../build/win32/vs10/gdk.vcxproj.filtersin
-       for F in $(libgdk_win32_2_0_la_SOURCES); do \
-               case $$F in \
-               *.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'"><Filter>Source 
Files</Filter></ClCompile>' \
-                    ;; \
-               esac; \
-       done >libgdk.vs10.sourcefiles.filters
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxproj.filtersin >$@
-       rm libgdk.vs10.sourcefiles.filters
+# ---------------- MSVC Projects ----------------
+MSVCPROJS = gdk
+
+gdk_FILES = $(libgdk_win32_2_0_la_SOURCES)
+gdk_EXCLUDES = gdkdummy
+
+gdk_HEADERS_DIR = $(gdkincludedir)
+gdk_HEADERS_INST = $(gdkinclude_HEADERS)
+gdk_HEADERS_EXCLUDES = gdkdummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(top_builddir)/build/win32/vs9/gdk.vcproj $(top_builddir)/build/win32/vs9/gdk.headers
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 17d048e..d57ad35 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -64,4 +64,18 @@ libgdk_win32_la_SOURCES = \
 libgdkinclude_HEADERS =                \
        gdkwin32.h
 
+# -------- MSVC Project Items -----
+MSVCPROJS = gdk-win32
+
+gdk_win32_FILES = $(libgdk_win32_la_SOURCES)
+gdk_win32_EXCLUDES = gdkwin32dummy
+
+gdk_win32_HEADERS_DIR = $(libgdkincludedir)
+gdk_win32_HEADERS_INST = $(libgdkinclude_HEADERS)
+gdk_win32_HEADERS_EXCLUDES = gdkwin32dummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(top_builddir)/build/win32/vs9/gdk-win32.vcproj $(top_builddir)/build/win32/vs9/gdk-win32.headers
+
 -include $(top_srcdir)/git.mk
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1b2afc5..9315919 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -944,37 +944,19 @@ install-mac-key-theme:
 uninstall-mac-key-theme:
 endif
 
-dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj 
../build/win32/vs10/gtk.vcxproj.filters
-
-../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
-       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
-               case $$F in \
-               *.c) echo '   <File RelativePath="..\..\..\gtk\'$$F'" />' \
-                    ;; \
-               esac; \
-       done >libgtk.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
-       rm libgtk.sourcefiles
-
-../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
-       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
-               case $$F in \
-               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
-                    ;; \
-               esac; \
-       done >libgtk.vs10.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
-       rm libgtk.vs10.sourcefiles
-
-../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
-       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
-               case $$F in \
-               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source 
Files</Filter></ClCompile>' \
-                    ;; \
-               esac; \
-       done >libgtk.vs10.sourcefiles.filters
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@
-       rm libgtk.vs10.sourcefiles.filters
+# -------------- MSVC Projects ----------------
+MSVCPROJS = gtk
+
+gtk_FILES = $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources)
+gtk_EXCLUDES = gtkdummy
+
+gtk_HEADERS_DIR = $(libgtkincludedir)
+gtk_HEADERS_INST = $(gtkinclude_HEADERS)
+gtk_HEADERS_EXCLUDES = gtkdummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(top_builddir)/build/win32/vs9/gtk.vcproj $(top_builddir)/build/win32/vs9/gtk.headers
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index 45fa5a0..200be83 100644
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -38,4 +38,14 @@ libwimp_la_LDFLAGS = \
 
 libwimp_la_LIBADD = $(LDADDS) -lgdi32
 
+# ---------------- MSVC Projects ---------------
+MSVCPROJS = libwimp
+
+libwimp_FILES = $(libwimp_la_SOURCES)
+libwimp_EXCLUDES = libwimpdummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(top_builddir)/build/win32/vs9/libwimp.vcproj
+
 -include $(top_srcdir)/git.mk
diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am
index 22d18d9..a055b88 100644
--- a/modules/other/gail/libgail-util/Makefile.am
+++ b/modules/other/gail/libgail-util/Makefile.am
@@ -76,6 +76,20 @@ libgailutil_la_LDFLAGS = \
        $(export_symbols)                       \
         $(LDFLAGS)
 
+# ----------------- MSVC Projects ------------------
+MSVCPROJS = gailutil
+
+gailutil_FILES = $(libgailutil_la_SOURCES)
+gailutil_EXCLUDES = gaildummy
+
+gailutil_HEADERS_DIR = $(libgailutilincludedir)
+gailutil_HEADERS_INST = $(libgailutilinclude_HEADERS)
+gailutil_HEADERS_EXCLUDES = gaildummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(top_builddir)/build/win32/vs9/gailutil.vcproj $(top_builddir)/build/win32/vs9/gailutil.headers
+
 gailutil.lib: libgailutil.la gailutil.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll 
-def:gailutil.def -out:$@
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]