glibmm r796 - in trunk: . MSVC_Net2005/giomm MSVC_Net2008/giomm tools/extra_defs_gen

[arminb svn gnome org]

Author: arminb
Date: Mon Mar 16 14:25:37 2009
New Revision: 796
URL: http://svn.gnome.org/viewvc/glibmm?rev=796&view=rev

Log:
2009-03-16  Armin Burgmeier  <armin openismus com>

	* MSVC_Net2005/giomm/giomm.vcproj:
	* MSVC_Net2008/giomm/giomm.vcproj: Added emblem.[h|cc],
	emblemedicon.[h|cc] and memoryoutputstream.[h|cc] to the project.

	* tools/extra_defs_gen/generate_defs_gio.cc: #ifdef-out the unix types
	on Windows.

Modified:
   trunk/ChangeLog
   trunk/MSVC_Net2005/giomm/giomm.vcproj
   trunk/MSVC_Net2008/giomm/giomm.vcproj
   trunk/tools/extra_defs_gen/generate_defs_gio.cc

Modified: trunk/MSVC_Net2005/giomm/giomm.vcproj
==============================================================================
--- trunk/MSVC_Net2005/giomm/giomm.vcproj	(original)
+++ trunk/MSVC_Net2005/giomm/giomm.vcproj	Mon Mar 16 14:25:37 2009
@@ -215,6 +215,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\emblem.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gio\giomm\emblemedicon.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\enums.cc"
 				>
 			</File>
@@ -291,6 +299,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\memoryoutputstream.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\mount.cc"
 				>
 			</File>
@@ -369,6 +381,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\emblem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gio\giomm\emblemedicon.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\enums.h"
 				>
 			</File>
@@ -445,6 +465,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\memoryoutputstream.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\mount.h"
 				>
 			</File>

Modified: trunk/MSVC_Net2008/giomm/giomm.vcproj
==============================================================================
--- trunk/MSVC_Net2008/giomm/giomm.vcproj	(original)
+++ trunk/MSVC_Net2008/giomm/giomm.vcproj	Mon Mar 16 14:25:37 2009
@@ -214,6 +214,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\emblem.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gio\giomm\emblemedicon.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\enums.cc"
 				>
 			</File>
@@ -290,6 +298,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\memoryoutputstream.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\mount.cc"
 				>
 			</File>
@@ -368,6 +380,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\emblem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gio\giomm\emblemedicon.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\enums.h"
 				>
 			</File>
@@ -444,6 +464,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gio\giomm\memoryoutputstream.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gio\giomm\mount.h"
 				>
 			</File>

Modified: trunk/tools/extra_defs_gen/generate_defs_gio.cc
==============================================================================
--- trunk/tools/extra_defs_gen/generate_defs_gio.cc	(original)
+++ trunk/tools/extra_defs_gen/generate_defs_gio.cc	Mon Mar 16 14:25:37 2009
@@ -20,8 +20,11 @@
 #include "generate_extra_defs.h"
 #include <iostream>
 #include <gio/gio.h>
-#include <gio/gunixinputstream.h>
-#include <gio/gunixoutputstream.h>
+
+#ifndef G_OS_WIN32
+# include <gio/gunixinputstream.h>
+# include <gio/gunixoutputstream.h>
+#endif
 
 int main (int argc, char** argv)
 {
@@ -47,8 +50,10 @@
             << get_defs(G_TYPE_FILTER_INPUT_STREAM)
             << get_defs(G_TYPE_FILTER_OUTPUT_STREAM)
 
+#ifndef G_OS_WIN32
             << get_defs(G_TYPE_UNIX_INPUT_STREAM)
             << get_defs(G_TYPE_UNIX_OUTPUT_STREAM)
+#endif
 
             << get_defs(G_TYPE_INPUT_STREAM)
             << get_defs(G_TYPE_LOADABLE_ICON)