Update Visual C++ property sheets

The last commit (Add a preconfigured gio/gnetworking.h for Windows) has to
be split into two as git am does not like a patch that deals with files
that have different line feeds.

This updates the property sheets to use the pre-configured
gio/gnetworking.h during the build process.

https://bugzilla.gnome.org/show_bug.cgi?id=690163

diff --git a/build/win32/vs10/glib.props b/build/win32/vs10/glib.props
index 44be8f4..fba6bc7 100644 (file)
--- a/build/win32/vs10/glib.props
+++ b/build/win32/vs10/glib.props
@@ -571,11 +571,11 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
 
 :DONE_GMODULECONF_H
 
-if exist ..\..\..\gio\gconstructor_as_data.h goto DONE_GCONSTRUCTOR_AS_DATA_H
+if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H
 
-perl ..\..\..\gio\data-to-c.pl ..\..\..\glib\gconstructor.h gconstructor_code > ..\..\..\gio\gconstructor_as_data.h
+copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h
 
-:DONE_GCONSTRUCTOR_AS_DATA_H
+:DONE_GNETWORKING_H
 
 </Command>
     </PreBuildEvent>

diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops
index 84b60f2..f4211c8 100644 (file)
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib.vsprops
@@ -32,9 +32,9 @@ if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H

 copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
\r
 :DONE_GMODULECONF_H
\r
 \r
-if exist ..\..\..\gio\gconstructor_as_data.h goto DONE_GCONSTRUCTOR_AS_DATA_H
\r
-perl ..\..\..\gio\data-to-c.pl ..\..\..\glib\gconstructor.h gconstructor_code > ..\..\..\gio\gconstructor_as_data.h
\r
-:DONE_GCONSTRUCTOR_AS_DATA_H
\r
+if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H
\r
+copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h
\r
+:DONE_GNETWORKING_H
\r
 "\r
        />\r
        <UserMacro\r