Further work on VS9 project files

This commit is contained in:
Tor Lillqvist 2010-02-04 19:57:38 +02:00
parent 021643cda4
commit 762e18d8ce
3 changed files with 46 additions and 10 deletions

View File

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

View File

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

View File

@ -22,7 +22,7 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib.vsprops"
OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
@ -35,7 +35,7 @@
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib.vsprops"
OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
DeleteExtensionsOnClean="" DeleteExtensionsOnClean=""
@ -48,7 +48,7 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib.vsprops"
OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -62,7 +62,7 @@
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib.vsprops"
OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"