Avoid much of duplication in lists of source files
authorTor Lillqvist <tml@iki.fi>
Sun, 21 Mar 2010 14:11:49 +0000 (16:11 +0200)
committerTor Lillqvist <tml@iki.fi>
Sun, 21 Mar 2010 14:15:02 +0000 (16:15 +0200)
Don't keep the lists of source files for libglib, libgobject and
libgio in the VS project files in addition to the canonical location,
the corresponding Makefile.am files.

Instead, generate the corresponding .vcproj files at make dist time
using the C preprocessor, from template files called .vcprojin. We
still list explicitly in the .vcprojin files some of the
Windows-specific source files, and the sources files of gnulib and
pcre.

build/win32/vs9/Makefile.am
build/win32/vs9/README.txt
build/win32/vs9/gio.vcproj [deleted file]
build/win32/vs9/gio.vcprojin [new file with mode: 0644]
build/win32/vs9/glib.vcprojin [moved from build/win32/vs9/glib.vcproj with 55% similarity]
build/win32/vs9/gobject.vcprojin [moved from build/win32/vs9/gobject.vcproj with 83% similarity]
gio/Makefile.am
glib/Makefile.am
gobject/Makefile.am

index 88d919a..e9b379f 100644 (file)
@@ -3,12 +3,15 @@ EXTRA_DIST = \
        glib.sln \
        glib.vsprops \
        glib.vcproj \
+       glib.vcprojin \
        glib-genmarshal.vcproj \
        gspawn-win32-helper-console.vcproj \
        gspawn-win32-helper.vcproj \
        gmodule.vcproj \
        gobject.vcproj \
+       gobject.vcprojin \
        gthread.vcproj \
        gio.vcproj \
+       gio.vcprojin \
        testglib.vcproj \
        install.vcproj
index 662cb2a..43f1334 100644 (file)
@@ -4,7 +4,8 @@ This VS9 solution and the projects it includes are intented to be used
 in a GLib source tree unpacked from a tarball. In a git checkout you\r
 first need to use some Unix-like environment or manual work to expand\r
 the .in files needed, mainly config.h.win32.in into config.h.win32 and\r
-glibconfig.h.win32.in into glibconfig.h.win32.\r
+glibconfig.h.win32.in into glibconfig.h.win32. You will also need to\r
+expand the .vcprojin files here into .vcproj files.\r
 \r
 The only external dependency is proxy-libintl. Fetch the latest\r
 proxy-libintl-dev zipfile from\r
diff --git a/build/win32/vs9/gio.vcproj b/build/win32/vs9/gio.vcproj
deleted file mode 100644 (file)
index a5d2145..0000000
+++ /dev/null
@@ -1,608 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9.00"
-       Name="gio"
-       ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
-       RootNamespace="gio"
-       TargetFrameworkVersion="131072"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
-                       ConfigurationType="2"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                               CompileAs="1"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
-                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-                               LinkIncremental="2"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
-                               TargetMachine="1"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
-                       ConfigurationType="2"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                               CompileAs="1"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
-                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-                               LinkIncremental="1"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
-                               TargetMachine="1"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
-                       ConfigurationType="2"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                               CompileAs="1"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
-                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-                               LinkIncremental="2"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
-                               TargetMachine="17"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
-                       ConfigurationType="2"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                               CompileAs="1"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
-                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
-                               LinkIncremental="1"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
-                               TargetMachine="17"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\..\gio\gappinfo.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gasynchelper.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gasyncinitable.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gasyncresult.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gbufferedinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gbufferedoutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gcancellable.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gcontenttype.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gcharsetconverter.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gconverter.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gconverterinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gconverteroutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gdatainputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gdataoutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gdrive.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gdummyfile.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gemblem.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gemblemedicon.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfile.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfiledescriptorbased.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfileattribute.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfileenumerator.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfileicon.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfileinfo.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfileinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfileiostream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfilemonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfilenamecompleter.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfileoutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfilterinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gfilteroutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gicon.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\ginetaddress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\ginetsocketaddress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\ginitable.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\ginputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gio-marshal.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gioaliasdef.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gioenumtypes.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gioerror.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\giomodule.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gioscheduler.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\giostream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gloadableicon.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocaldirectorymonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalfile.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalfileenumerator.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalfileinfo.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalfileinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalfileiostream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalfilemonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalfileoutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\glocalvfs.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gmemoryinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gmemoryoutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gmount.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gmountoperation.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gnativevolumemonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gnetworkaddress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gnetworkservice.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\goutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gpollfilemonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gresolver.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gseekable.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsimpleasyncresult.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocket.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketaddress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketaddressenumerator.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketclient.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketconnectable.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketconnection.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketcontrolmessage.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketlistener.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketoutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsocketservice.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gsrvtarget.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gtcpconnection.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gthemedicon.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gthreadedresolver.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gthreadedsocketservice.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gunionvolumemonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gvfs.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gvolume.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gvolumemonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gzlibcompressor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gzlibdecompressor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gwin32appinfo.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gwin32mount.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gwin32resolver.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gwin32volumemonitor.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       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}"
-                       >
-                       <File
-                               RelativePath="..\..\..\gio\gio.rc"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gio.symbols"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-       </Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
new file mode 100644 (file)
index 0000000..1772c46
--- /dev/null
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9.00"
+       Name="gio"
+       ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
+       RootNamespace="gio"
+       TargetFrameworkVersion="131072"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       InheritedPropertySheets=".\glib.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                               CompileAs="1"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="$(IntDir)\gio.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       InheritedPropertySheets=".\glib.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                               CompileAs="1"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="$(IntDir)\gio.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       InheritedPropertySheets=".\glib.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                               CompileAs="1"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="$(IntDir)\gio.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       InheritedPropertySheets=".\glib.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="../../../gio,../../../gmodule"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                               CompileAs="1"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="$(IntDir)\gio.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+#include "libgio.sourcefiles"
+                       <File RelativePath="..\..\..\gio\gwin32appinfo.c" />
+                       <File RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c" />
+                       <File RelativePath="..\..\..\gio\gwin32mount.c" />
+                       <File RelativePath="..\..\..\gio\gwin32resolver.c" />
+                       <File RelativePath="..\..\..\gio\gwin32volumemonitor.c" />
+                       <File RelativePath="..\..\..\gio\win32\gwinhttpfile.c" />
+                       <File RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c" />
+                       <File RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c" />
+                       <File RelativePath="..\..\..\gio\win32\gwinhttpvfs.c" />
+               </Filter>
+               <Filter
+                       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}"
+                       >
+                       <File
+                               RelativePath="..\..\..\gio\gio.rc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\gio\gio.symbols"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating gio.def"
+                                               CommandLine="$(GlibGenerateGioDef)"
+                                               Outputs="$(IntDir)/gio.def"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating gio.def"
+                                               CommandLine="$(GlibGenerateGioDef)"
+                                               Outputs="$(IntDir)/gio.def"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating gio.def"
+                                               CommandLine="$(GlibGenerateGioDef)"
+                                               Outputs="$(IntDir)/gio.def"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating gio.def"
+                                               CommandLine="$(GlibGenerateGioDef)"
+                                               Outputs="$(IntDir)/gio.def"
+                                       />
+                               </FileConfiguration>
+                       </File>
+               </Filter>
+       </Files>
+</VisualStudioProject>
similarity index 55%
rename from build/win32/vs9/glib.vcproj
rename to build/win32/vs9/glib.vcprojin
index 4aa8a64..560ca63 100644 (file)
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File
-                               RelativePath="..\..\..\glib\garray.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gasyncqueue.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gatomic.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gbacktrace.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gbase64.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gbitlock.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gbookmarkfile.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gbuffer.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gcache.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gchecksum.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gcompletion.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gconvert.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gdataset.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gdate.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gdir.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gerror.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gfileutils.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\ghash.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\ghook.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\ghostutils.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\giochannel.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\giowin32.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gkeyfile.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\glist.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gmain.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gmappedfile.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gmarkup.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gmem.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gmessages.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gnode.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\goption.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gpattern.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gpoll.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gprimes.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gprintf.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gqsort.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gqueue.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\grand.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gregex.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\grel.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gscanner.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gsequence.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gshell.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gslice.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gslist.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gspawn-win32.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gstdio.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gstrfuncs.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gstring.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gtestutils.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gthread.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gthreadpool.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gtimer.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gtree.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gunibreak.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gunicollate.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gunidecomp.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\guniprop.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gurifuncs.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gutf8.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gutils.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gvariant.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gvariant-serialiser.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gvarianttype.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gvarianttypeinfo.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gvariant-core.c"
-                       />
-                       <File
-                               RelativePath="..\..\..\glib\gwin32.c"
-                       />
+#include "libglib.sourcefiles"
+                       <File RelativePath="..\..\..\glib\giowin32.c" />
+                       <File RelativePath="..\..\..\glib\gspawn-win32.c" />
+                       <File RelativePath="..\..\..\glib\gwin32.c" />
                        <Filter
                                Name="libcharset"
                                >
                        <Filter
                                Name="gnulib"
                                >
-                               <File
-                                       RelativePath="..\..\..\glib\gnulib\asnprintf.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\gnulib\printf-args.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\gnulib\printf-parse.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\gnulib\printf.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\gnulib\vasnprintf.c"
-                                       >
-                               </File>
+                               <File RelativePath="..\..\..\glib\gnulib\asnprintf.c" />
+                               <File RelativePath="..\..\..\glib\gnulib\printf-args.c" />
+                               <File RelativePath="..\..\..\glib\gnulib\printf-parse.c" />
+                               <File RelativePath="..\..\..\glib\gnulib\printf.c" />
+                               <File RelativePath="..\..\..\glib\gnulib\vasnprintf.c" />
                        </Filter>
                        <Filter
                                Name="pcre"
                                >
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_chartables.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_compile.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_config.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_exec.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_get.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_globals.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_info.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_maketables.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_newline.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_refcount.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_study.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_tables.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_version.c"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\..\..\glib\pcre\pcre_xclass.c"
-                                       >
-                               </File>
+                               <File RelativePath="..\..\..\glib\pcre\pcre_chartables.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_compile.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_config.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_exec.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_get.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_globals.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_info.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_maketables.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_newline.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_refcount.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_study.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_tables.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_version.c" />
+                               <File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" />
                        </Filter>
                </Filter>
                <Filter
similarity index 83%
rename from build/win32/vs9/gobject.vcproj
rename to build/win32/vs9/gobject.vcprojin
index a7d98c7..9f64f2f 100644 (file)
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File
-                               RelativePath="..\..\..\gobject\gatomicarray.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gboxed.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gclosure.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\genums.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gobject.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gparam.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gparamspecs.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gsignal.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gsourceclosure.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gtype.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gtypemodule.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gtypeplugin.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gvalue.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gvaluearray.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gvaluetransform.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gobject\gvaluetypes.c"
-                               >
-                       </File>
+#include "libgobject.sourcefiles"
                </Filter>
                <Filter
                        Name="Header Files"
index b49d65c..fd42438 100644 (file)
@@ -469,12 +469,21 @@ gio_querymodules_LDADD     = \
        libgio-2.0.la                                   \
        $(NULL)
 
-dist-hook: $(BUILT_EXTRA_DIST)
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
        files='$(BUILT_EXTRA_DIST)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
          cp $$d/$$f $(distdir) || exit 1; done
 
+../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
+       for F in $(libgio_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgio.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
+
 if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:
        mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
index 287301e..0654503 100644 (file)
@@ -383,12 +383,21 @@ endif
 glib-2.0.lib: libglib-2.0.la glib.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
 
-dist-hook: $(BUILT_EXTRA_DIST)
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj
        files='$(BUILT_EXTRA_DIST)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
          cp $$d/$$f $(distdir) || exit 1; done
 
+../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin
+       for F in $(libglib_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\glib\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libglib.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@
+
 distclean-local:
        if test $(srcdir) = .; then :; else \
            rm -f libglib-gdb.py; \
index 928c616..5f31e2a 100644 (file)
@@ -256,12 +256,21 @@ gobject-win32-res.o: gobject.rc
 gobject-2.0.lib: libgobject-2.0.la gobject.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gobject.def -out:$@
 
-dist-hook: $(BUILT_EXTRA_DIST)
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gobject.vcproj
        files='$(BUILT_EXTRA_DIST)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
          cp $$d/$$f $(distdir) || exit 1; done
 
+../build/win32/vs9/gobject.vcproj: $(top_srcdir)/build/win32/vs9/gobject.vcprojin
+       for F in $(libgobject_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\gobject\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgobject.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gobject.vcprojin >$@
+
 install-data-local: install-ms-lib install-def-file
 
 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-gdb