Various updates...

-Made up for missed header files in glib and gio during "install"
-Added macro necessary for GLib/GModule .def generation under Win64
-updated location of getting glibconfig.h.win32 for building

diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops
index 45edd96..ba098d4 100644 (file)
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib.vsprops
@@ -24,8 +24,8 @@ if exist ..\..\..\config.h goto DONE_CONFIG_H

 copy ..\..\..\config.h.win32 ..\..\..\config.h
\r
 :DONE_CONFIG_H
\r
 \r
-if exist ..\..\..\glibconfig.h goto DONE_GLIBCONFIG_H
\r
-copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h
\r
+if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H
\r
+copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h
\r
 :DONE_GLIBCONFIG_H
\r
 \r
 if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H
\r
@@ -39,6 +39,7 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
&#
 mkdir $(OutDir)
\r
 mkdir $(OutDir)\bin
\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin
\r
+if exist $(SolutionDir)$(ConfigurationName)_ExtPCRE copy $(SolutionDir)$(ConfigurationName)_ExtPCRE\$(PlatformName)\bin\*.dll $(OutDir)\bin
\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin
\r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin
\r
 \r
@@ -61,6 +62,7 @@ copy ..\..\..\glib\gcompletion.h $(OutDir)\include\glib-2.0\glib

 copy ..\..\..\glib\gconvert.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gdataset.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gdate.h $(OutDir)\include\glib-2.0\glib
\r
+copy ..\..\..\glib\gdatetime.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gdir.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gerror.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gfileutils.h $(OutDir)\include\glib-2.0\glib
\r
@@ -103,6 +105,7 @@ copy ..\..\..\glib\gtestutils.h $(OutDir)\include\glib-2.0\glib

 copy ..\..\..\glib\gthread.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gthreadpool.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gtimer.h $(OutDir)\include\glib-2.0\glib
\r
+copy ..\..\..\glib\gtimezone.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gtree.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gtypes.h $(OutDir)\include\glib-2.0\glib
\r
 copy ..\..\..\glib\gunicode.h $(OutDir)\include\glib-2.0\glib
\r
@@ -135,8 +138,11 @@ copy ..\..\..\gobject\gvaluecollector.h $(OutDir)\include\glib-2.0\gobject
 copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject
\r
 \r
 mkdir $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gaction.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gactiongroup.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gapplication.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gapplicationcommandline.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gasyncinitable.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio
\r
@@ -199,10 +205,19 @@ copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio
&#x
 copy ..\..\..\gio\gnetworkaddress.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gnetworkservice.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gperiodic.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gpermission.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gproxy.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gproxyaddress.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gproxyaddressenumerator.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gproxyresolver.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gresolver.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gsettings.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gsimpleaction.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gsimpleactiongroup.h $(OutDir)\include\glib-2.0\gio
\r
+copy ..\..\..\gio\gsimplepermission.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gsocket.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gsocketaddress.h $(OutDir)\include\glib-2.0\gio
\r
 copy ..\..\..\gio\gsocketaddressenumerator.h $(OutDir)\include\glib-2.0\gio
\r
@@ -227,9 +242,10 @@ copy ..\..\..\gio\gwin32inputstream.h $(OutDir)\include\gio-win32-2.0\gio
&
 copy ..\..\..\gio\gwin32outputstream.h $(OutDir)\include\gio-win32-2.0\gio
\r
 \r
 mkdir $(OutDir)\lib\glib-2.0\include
\r
-copy ..\..\..\glibconfig.h $(OutDir)\lib\glib-2.0\include
\r
+copy ..\..\..\glib\glibconfig.h $(OutDir)\lib\glib-2.0\include
\r
 \r
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\lib
\r
+if exist $(SolutionDir)$(ConfigurationName)_ExtPCRE copy $(SolutionDir)$(ConfigurationName)_ExtPCRE\$(PlatformName)\bin\*-2.0.lib $(OutDir)\lib
\r
 "\r
        />\r
        <UserMacro\r
@@ -237,10 +253,18 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\
                Value="echo EXPORTS &gt;&quot;$(IntDir)\glib.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT ..\..\..\glib\glib.symbols &gt;&gt;&quot;$(IntDir)\glib.def&quot;"\r
        />\r
        <UserMacro\r
+               Name="GlibGenerateGlibDefW64"\r
+               Value="echo EXPORTS &gt;&quot;$(IntDir)\glib.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -D_WIN64 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT ..\..\..\glib\glib.symbols &gt;&gt;&quot;$(IntDir)\glib.def&quot;"\r
+       />\r
+       <UserMacro\r
                Name="GlibGenerateGmoduleDef"\r
                Value="echo EXPORTS &gt;&quot;$(IntDir)\gmodule.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 ..\..\..\gmodule\gmodule.symbols &gt;&gt;&quot;$(IntDir)\gmodule.def&quot;"\r
        />\r
        <UserMacro\r
+               Name="GlibGenerateGmoduleDefW64"\r
+               Value="echo EXPORTS &gt;&quot;$(IntDir)\gmodule.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -D_WIN64 ..\..\..\gmodule\gmodule.symbols &gt;&gt;&quot;$(IntDir)\gmodule.def&quot;"\r
+       />\r
+       <UserMacro\r
                Name="GlibGenerateGobjectDef"\r
                Value="echo EXPORTS &gt;&quot;$(IntDir)\gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gobject\gobject.symbols &gt;&gt;&quot;$(IntDir)\gobject.def&quot;"\r
        />\r