diff options
| author | Tor Lillqvist <tml@iki.fi> | 2010-02-04 19:57:38 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2010-02-04 19:59:12 +0200 |
| commit | 762e18d8cebf907e51aed14298525048f7c9e015 (patch) | |
| tree | b4152d5541ab52402fc64912ca6cfd2dc612922b /build | |
| parent | 021643cda4f9b13fd72e898165744e9aefb346cd (diff) | |
Further work on VS9 project files
Diffstat (limited to 'build')
| -rw-r--r-- | build/win32/vs9/README.txt | 16 | ||||
| -rw-r--r-- | build/win32/vs9/glib.vsprops | 32 | ||||
| -rw-r--r-- | build/win32/vs9/install.vcproj | 8 |
3 files changed, 46 insertions, 10 deletions
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index 86620ec1a..662cb2a9e 100644 --- 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>:
<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
<root>\glib\<this-glib-source-tree>\build\win32\vs9\README.
<PlatformName> is either Win32 or x64, as in VS9 project files.
-<root>\glib\dependencies\<PlatformName>\proxy-libintl contains the
-unpacked proxy-libintl zip file, so that for instance libintl.h is at
-<root>\glib\dependencies\<PlatformName>\proxy-libintl\include\libintl.h.
+You should unpack the proxy-libintl-dev zip file into
+<root>\vs9\<PlatformName>, so that for instance libintl.h end up at
+<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>
diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops index 75006d495..5a9c092e8 100644 --- a/build/win32/vs9/glib.vsprops +++ b/build/win32/vs9/glib.vsprops @@ -8,14 +8,14 @@ >
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl/include"
+ AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="intl.lib"
- AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl/lib"
+ AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<Tool
Name="VCPreBuildEventTool"
@@ -36,12 +36,14 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
&# <UserMacro
Name="GlibDoInstall"
Value="
+mkdir $(OutDir)

mkdir $(OutDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin

mkdir $(OutDir)\include\glib-2.0\glib

+copy ..\..\..\msvc_recommended_pragmas.h $(OutDir)\include\glib-2.0

copy ..\..\..\glib\glib.h $(OutDir)\include\glib-2.0

copy ..\..\..\gmodule\gmodule.h $(OutDir)\include\glib-2.0

copy ..\..\..\glib\glib-object.h $(OutDir)\include\glib-2.0

@@ -78,6 +80,7 @@ copy ..\..\..\glib\gmessages.h $(OutDir)\include\glib-2.0\glib
 copy ..\..\..\glib\gnode.h $(OutDir)\include\glib-2.0\glib

copy ..\..\..\glib\goption.h $(OutDir)\include\glib-2.0\glib

copy ..\..\..\glib\gpattern.h $(OutDir)\include\glib-2.0\glib

+copy ..\..\..\glib\gpoll.h $(OutDir)\include\glib-2.0\glib

copy ..\..\..\glib\gprimes.h $(OutDir)\include\glib-2.0\glib

copy ..\..\..\glib\gprintf.h $(OutDir)\include\glib-2.0\glib

copy ..\..\..\glib\gqsort.h $(OutDir)\include\glib-2.0\glib

@@ -127,6 +130,7 @@ copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject
� mkdir $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gasyncinitable.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gbufferedoutputstream.h $(OutDir)\include\glib-2.0\gio

@@ -143,12 +147,16 @@ copy ..\..\..\gio\gfileenumerator.h $(OutDir)\include\glib-2.0\gio
 copy ..\..\..\gio\gfileicon.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gfileinfo.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gfileinputstream.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gfileiostream.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gfilemonitor.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gfilenamecompleter.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gfileoutputstream.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gfilterinputstream.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gfilteroutputstream.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gicon.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\ginetaddress.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\ginetsocketaddress.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\ginitable.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\ginputstream.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gio.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gioenums.h $(OutDir)\include\glib-2.0\gio

@@ -156,6 +164,7 @@ copy ..\..\..\gio\gioenumtypes.h $(OutDir)\include\glib-2.0\gio
 copy ..\..\..\gio\gioerror.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\giomodule.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gioscheduler.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\giostream.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\giotypes.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gloadableicon.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gmemoryinputstream.h $(OutDir)\include\glib-2.0\gio

@@ -163,10 +172,25 @@ copy ..\..\..\gio\gmemoryoutputstream.h $(OutDir)\include\glib-2.0\gio
� copy ..\..\..\gio\gmount.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gmountoperation.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gnetworkaddress.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gnetworkservice.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gresolver.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocket.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketaddress.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketaddressenumerator.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketclient.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketconnectable.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketconnection.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketcontrolmessage.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketlistener.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsocketservice.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gsrvtarget.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gtcpconnection.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gthemedicon.h $(OutDir)\include\glib-2.0\gio

+copy ..\..\..\gio\gthreadedsocketservice.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gvfs.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gvolume.h $(OutDir)\include\glib-2.0\gio

copy ..\..\..\gio\gvolumemonitor.h $(OutDir)\include\glib-2.0\gio

@@ -219,4 +243,8 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\ Name="GlibDllSuffix"
Value="$(GlibSeparateVS9DllSuffix)"
/>
+ <UserMacro
+ Name="GlibEtcInstallRoot"
+ Value="..\..\..\..\..\vs9\$(PlatformName)"
+ />
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj index 94c28dc97..6f30f58fa 100644 --- a/build/win32/vs9/install.vcproj +++ b/build/win32/vs9/install.vcproj @@ -22,7 +22,7 @@ <Configuration
Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops"
- OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
+ OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
DeleteExtensionsOnClean=""
@@ -35,7 +35,7 @@ <Configuration
Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops"
- OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
+ OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
DeleteExtensionsOnClean=""
@@ -48,7 +48,7 @@ <Configuration
Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops"
- OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
+ OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -62,7 +62,7 @@ <Configuration
Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops"
- OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
+ OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
WholeProgramOptimization="1"
|