glib r7404 - in trunk/build: . win32/vs8

[tml svn gnome org]

Author: tml
Date: Wed Aug 27 13:20:28 2008
New Revision: 7404
URL: http://svn.gnome.org/viewvc/glib?rev=7404&view=rev

Log:
2008-08-27  Tor Lillqvist  <tml novell com>

	* win32/vs8/*.vcproj: Add "win32" directory level to the
	references to the dependencies folder (which each actual user of
	the project file probably needs to edit anyway depending on their
	directory structure). Add missing files, remove nonexistent files.



Modified:
   trunk/build/ChangeLog
   trunk/build/win32/vs8/gio.vcproj
   trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj
   trunk/build/win32/vs8/gspawn-win32-helper.vcproj

Modified: trunk/build/win32/vs8/gio.vcproj
==============================================================================
--- trunk/build/win32/vs8/gio.vcproj	(original)
+++ trunk/build/win32/vs8/gio.vcproj	Wed Aug 27 13:20:28 2008
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"
+				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"
 				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"
@@ -65,7 +65,7 @@
 				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
 				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
+				AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
 				ModuleDefinitionFile="../../../gio/gio.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"
+				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"
 				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"
@@ -146,7 +146,7 @@
 				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
 				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
+				AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
 				ModuleDefinitionFile="../../../gio/gio.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -234,6 +234,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\gio\gemblem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gemblemedicon.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\gio\gfile.c"
 				>
 			</File>
@@ -406,10 +414,34 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\gio\gwin32mount.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gwin32volumemonitor.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
 				>
 			</File>
-		</Filter>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
+				>
+			</File>	
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
+				>
+			</File>	
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
+				>
+			</File>	
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
+				>
+			</File>	
+	</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

Modified: trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj
==============================================================================
--- trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj	(original)
+++ trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj	Wed Aug 27 13:20:28 2008
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
+				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
+				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"

Modified: trunk/build/win32/vs8/gspawn-win32-helper.vcproj
==============================================================================
--- trunk/build/win32/vs8/gspawn-win32-helper.vcproj	(original)
+++ trunk/build/win32/vs8/gspawn-win32-helper.vcproj	Wed Aug 27 13:20:28 2008
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
+				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
+				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"