Update with new source files and dependencies

diff --git a/build/win32/vs9/gio.vcproj b/build/win32/vs9/gio.vcproj
index 70e0edc6288dc2049909a965cd9c4603eaa21faa..7f6bdb83ceeadc96ab9ab911494fc2a9b9bb70ff 100644 (file)
--- a/build/win32/vs9/gio.vcproj
+++ b/build/win32/vs9/gio.vcproj
@@ -42,7 +42,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="$(IntDir)\gio.def"
@@ -76,7 +76,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="$(IntDir)\gio.def"
@@ -114,7 +114,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="$(IntDir)\gio.def"
@@ -148,7 +148,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="$(IntDir)\gio.def"
@@ -203,6 +203,22 @@
                                RelativePath="..\..\..\gio\gcontenttype.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\gio\gcharsetconverter.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\gio\gconverter.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\gio\gconverterinputstream.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\gio\gconverteroutputstream.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\gio\gdatainputstream.c"
                                >
@@ -231,6 +247,10 @@
                                RelativePath="..\..\..\gio\gfile.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\gio\gfiledescriptorbased.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\gio\gfileattribute.c"
                                >
@@ -491,6 +511,14 @@
                                RelativePath="..\..\..\gio\gvolumemonitor.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\gio\gzlibcompressor.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\gio\gzlibdecompressor.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\gio\gwin32appinfo.c"
                                >

diff --git a/build/win32/vs9/glib.sln b/build/win32/vs9/glib.sln
index 73056aded5be3e2130e0bbea52538ffe112ff60c..1196284f4cc671c787a47111305e6ca2580e698d 100644 (file)
--- a/build/win32/vs9/glib.sln
+++ b/build/win32/vs9/glib.sln
@@ -10,6 +10,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcproj", "{F172EFFC-E30F-4593-809E-DB2024B1E753}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0}\r
+               {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} = {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}"\r

diff --git a/build/win32/vs9/glib.vcproj b/build/win32/vs9/glib.vcproj
index 8d26c5a490987dcafcbd7e67283aacd132a9ca25..8fa730ae289933562852ba615d18a31e36b2801a 100644 (file)
--- a/build/win32/vs9/glib.vcproj
+++ b/build/win32/vs9/glib.vcproj
@@ -183,9 +183,15 @@
                        <File
                                RelativePath="..\..\..\glib\gbase64.c"
                        />
+                       <File
+                               RelativePath="..\..\..\glib\gbitlock.c"
+                       />
                        <File
                                RelativePath="..\..\..\glib\gbookmarkfile.c"
                        />
+                       <File
+                               RelativePath="..\..\..\glib\gbuffer.c"
+                       />
                        <File
                                RelativePath="..\..\..\glib\gcache.c"
                        />
@@ -345,6 +351,21 @@
                        <File
                                RelativePath="..\..\..\glib\gutils.c"
                        />
+                       <File
+                               RelativePath="..\..\..\glib\gvariant.c"
+                       />
+                       <File
+                               RelativePath="..\..\..\glib\gvariant-serialiser.c"
+                       />
+                       <File
+                               RelativePath="..\..\..\glib\gvarianttype.c"
+                       />
+                       <File
+                               RelativePath="..\..\..\glib\gvarianttypeinfo.c"
+                       />
+                       <File
+                               RelativePath="..\..\..\glib\gvariant-core.c"
+                       />
                        <File
                                RelativePath="..\..\..\glib\gwin32.c"
                        />

diff --git a/build/win32/vs9/gobject.vcproj b/build/win32/vs9/gobject.vcproj
index e267c46c5c91acb4f49323f115465046ed84e692..a4db4a8a72c79096bdb4623cf860518847b82091 100644 (file)
--- a/build/win32/vs9/gobject.vcproj
+++ b/build/win32/vs9/gobject.vcproj
@@ -164,6 +164,10 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
+                       <File
+                               RelativePath="..\..\..\gobject\gatomicarray.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\gobject\gboxed.c"
                                >