Further work on VS9 project files

diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index 86620ec..662cb2a 100644 (file)
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -15,15 +15,23 @@ builds. Set up the source tree as follows under some arbitrary top
 folder <root>:\r
 \r
 <root>\glib\<this-glib-source-tree>\r
-<root>\glib\dependencies\<PlatformName>\proxy-libintl\r
+<root>\vs9\<PlatformName>\r
 \r
 *this* file you are now reading is thus located at\r
 <root>\glib\<this-glib-source-tree>\build\win32\vs9\README.\r
 \r
 <PlatformName> is either Win32 or x64, as in VS9 project files.\r
 \r
-<root>\glib\dependencies\<PlatformName>\proxy-libintl contains the\r
-unpacked proxy-libintl zip file, so that for instance libintl.h is at\r
-<root>\glib\dependencies\<PlatformName>\proxy-libintl\include\libintl.h.\r
+You should unpack the proxy-libintl-dev zip file into\r
+<root>\vs9\<PlatformName>, so that for instance libintl.h end up at\r
+<root>\vs9\<PlatformName>\include\libintl.h.\r
+\r
+The "install" project will copy build results and headers into their\r
+appropriate location under <root>\vs9\<PlatformName>. For instance,\r
+built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into\r
+<root>\vs9\<PlatformName>\lib and GLib headers into\r
+<root>\vs9\<PlatformName>\include\glib-2.0. This is then from where\r
+project files higher in the stack are supposed to look for them, not\r
+from a specific GLib source tree.\r
 \r
 --Tor Lillqvist <tml@iki.fi>\r

diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops
index 75006d4..5a9c092 100644 (file)
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib.vsprops
@@ -8,14 +8,14 @@
        >\r
        <Tool\r
                Name="VCCLCompilerTool"\r
-               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl/include"\r
+               AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include"\r
                PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED"\r
                ForcedIncludeFiles="msvc_recommended_pragmas.h"\r
        />\r
        <Tool\r
                Name="VCLinkerTool"\r
                AdditionalDependencies="intl.lib"\r
-               AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl/lib"\r
+               AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"\r
        />\r
        <Tool\r
                Name="VCPreBuildEventTool"\r
@@ -36,12 +36,14 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#
        <UserMacro\r
                Name="GlibDoInstall"\r
                Value="\r
+mkdir $(OutDir)&#x0D;&#x0A;\r
 mkdir $(OutDir)\bin&#x0D;&#x0A;\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin&#x0D;&#x0A;\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin&#x0D;&#x0A;\r
 \r
 mkdir $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
+copy ..\..\..\msvc_recommended_pragmas.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;\r
 copy ..\..\..\glib\glib.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;\r
 copy ..\..\..\gmodule\gmodule.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;\r
 copy ..\..\..\glib\glib-object.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;\r
@@ -78,6 +80,7 @@ copy ..\..\..\glib\gmessages.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
 copy ..\..\..\glib\gnode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
 copy ..\..\..\glib\goption.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
 copy ..\..\..\glib\gpattern.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
+copy ..\..\..\glib\gpoll.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
 copy ..\..\..\glib\gprimes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
 copy ..\..\..\glib\gprintf.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
 copy ..\..\..\glib\gqsort.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;\r
@@ -127,6 +130,7 @@ copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0
 \r
 mkdir $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gasyncinitable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gbufferedoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
@@ -143,12 +147,16 @@ copy ..\..\..\gio\gfileenumerator.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gfileicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gfileinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gfileinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gfileiostream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gfilemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gfilenamecompleter.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gfileoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gfilterinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gfilteroutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\ginetaddress.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\ginetsocketaddress.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\ginitable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\ginputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gio.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gioenums.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
@@ -156,6 +164,7 @@ copy ..\..\..\gio\gioenumtypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
 copy ..\..\..\gio\gioerror.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\giomodule.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gioscheduler.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\giostream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\giotypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gloadableicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gmemoryinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
@@ -163,10 +172,25 @@ copy ..\..\..\gio\gmemoryoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0
 copy ..\..\..\gio\gmount.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gmountoperation.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gnetworkaddress.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gnetworkservice.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gresolver.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocket.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketaddress.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketaddressenumerator.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketclient.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketconnectable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketconnection.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketcontrolmessage.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketlistener.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsocketservice.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gsrvtarget.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gtcpconnection.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gthemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
+copy ..\..\..\gio\gthreadedsocketservice.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gvfs.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gvolume.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
 copy ..\..\..\gio\gvolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;\r
@@ -219,4 +243,8 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\
                Name="GlibDllSuffix"\r
                Value="$(GlibSeparateVS9DllSuffix)"\r
        />\r
+       <UserMacro\r
+               Name="GlibEtcInstallRoot"\r
+               Value="..\..\..\..\..\vs9\$(PlatformName)"\r
+       />\r
 </VisualStudioPropertySheet>\r

diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 94c28dc..6f30f58 100644 (file)
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -22,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        InheritedPropertySheets=".\glib.vsprops"\r
-                       OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"\r
+                       OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
@@ -35,7 +35,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        InheritedPropertySheets=".\glib.vsprops"\r
-                       OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"\r
+                       OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r
                        DeleteExtensionsOnClean=""\r
@@ -48,7 +48,7 @@
                <Configuration\r
                        Name="Release|Win32"\r
                        InheritedPropertySheets=".\glib.vsprops"\r
-                       OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"\r
+                       OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -62,7 +62,7 @@
                <Configuration\r
                        Name="Release|x64"\r
                        InheritedPropertySheets=".\glib.vsprops"\r
-                       OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"\r
+                       OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r