diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 59d06898d..52f261049 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -30,4 +30,8 @@ EXTRA_DIST = \
glib-compile-schemas.vcxproj.filters \
gsettings.vcxproj \
gsettings.vcxproj.filters \
+ glib-compile-resources.vcxproj \
+ glib-compile-resources.vcxproj.filters \
+ gresource.vcxproj \
+ gresource.vcxproj.filters \
install.vcxproj
diff --git a/build/win32/vs10/glib-compile-resources.vcxproj b/build/win32/vs10/glib-compile-resources.vcxproj
new file mode 100644
index 000000000..4df4c6511
--- /dev/null
+++ b/build/win32/vs10/glib-compile-resources.vcxproj
@@ -0,0 +1,177 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}
+ glibcompileresources
+ Win32Proj
+
+
+
+ Application
+ Unicode
+ true
+
+
+ Application
+ Unicode
+
+
+ Application
+ MultiByte
+ true
+
+
+ Application
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+
+
+
+ Disabled
+ ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)
+ _DEBUG;GIO_COMPILATION;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ true
+ Console
+ MachineX86
+
+
+
+
+ Disabled
+ ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)
+ _DEBUG;GIO_COMPILATION;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+ CompileAsC
+
+
+ true
+ Console
+ false
+
+
+ MachineX64
+
+
+
+
+ MaxSpeed
+ true
+ ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)
+ GIO_COMPILATION;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ ProgramDatabase
+
+
+ true
+ Console
+ true
+ true
+ MachineX86
+
+
+
+
+ ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)
+ GIO_COMPILATION;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+ CompileAsC
+
+
+ true
+ Console
+ true
+ true
+ false
+
+
+ MachineX64
+
+
+
+
+
+
+
+
+ {f3d1583c-5613-4809-bd98-7cc1c1276f92}
+ false
+
+
+ {12bca020-eabf-429e-876a-a476bc9c10c0}
+ false
+
+
+ {f172effc-e30f-4593-809e-db2024b1e753}
+ false
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/win32/vs10/glib-compile-resources.vcxproj.filters b/build/win32/vs10/glib-compile-resources.vcxproj.filters
new file mode 100644
index 000000000..265b6122a
--- /dev/null
+++ b/build/win32/vs10/glib-compile-resources.vcxproj.filters
@@ -0,0 +1,17 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/build/win32/vs10/glib.props b/build/win32/vs10/glib.props
index cfaaea81f..b0b084ffc 100644
--- a/build/win32/vs10/glib.props
+++ b/build/win32/vs10/glib.props
@@ -17,6 +17,10 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\glib-compile-schemas.exe $(C
copy $(SolutionDir)$(Configuration)\$(Platform)\bin\gsettings.exe $(CopyDir)\bin
+copy $(SolutionDir)$(Configuration)\$(Platform)\bin\glib-compile-resources.exe $(CopyDir)\bin
+
+copy $(SolutionDir)$(Configuration)\$(Platform)\bin\gresource.exe $(CopyDir)\bin
+
mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib
@@ -561,6 +565,12 @@ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
:DONE_GMODULECONF_H
+if exist ..\..\..\gio\gconstructor_as_data.h goto DONE_GCONSTRUCTOR_AS_DATA_H
+
+perl ..\..\..\gio\data-to-c.pl ..\..\..\glib\gconstructor.h gconstructor_code > ..\..\..\gio\gconstructor_as_data.h
+
+:DONE_GCONSTRUCTOR_AS_DATA_H
+
diff --git a/build/win32/vs10/glib.sln b/build/win32/vs10/glib.sln
index 62a6ed52f..fbba63ed6 100644
--- a/build/win32/vs10/glib.sln
+++ b/build/win32/vs10/glib.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcxproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmodule", "gmodule.vcxproj", "{4214047C-F5C1-40B3-8369-5DCED8C32770}"
@@ -24,6 +24,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsettings", "gsettings.vcxp
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gresource", "gresource.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280685}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-resources", "glib-compile-resources.vcxproj", "{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_ExtPCRE|Win32 = Debug_ExtPCRE|Win32
@@ -228,6 +232,38 @@ Global
{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.Build.0 = Debug|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release_ExtPCRE|x64.Build.0 = Release|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.ActiveCfg = Release|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|Win32.Build.0 = Release|Win32
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.ActiveCfg = Release|x64
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Release|x64.Build.0 = Release|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|Win32.ActiveCfg = Debug|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|Win32.Build.0 = Debug|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|x64.ActiveCfg = Debug|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug_ExtPCRE|x64.Build.0 = Debug|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|Win32.Build.0 = Debug|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.ActiveCfg = Debug|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Debug|x64.Build.0 = Debug|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|Win32.ActiveCfg = Release|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|Win32.Build.0 = Release|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|x64.ActiveCfg = Release|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_ExtPCRE|x64.Build.0 = Release|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.ActiveCfg = Release|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|Win32.Build.0 = Release|Win32
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.ActiveCfg = Release|x64
+ {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs10/gresource.vcxproj b/build/win32/vs10/gresource.vcxproj
new file mode 100644
index 000000000..44624af9f
--- /dev/null
+++ b/build/win32/vs10/gresource.vcxproj
@@ -0,0 +1,176 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {95A1571F-61BE-4C51-BE53-2F2DAB280685}
+ gresource
+ Win32Proj
+
+
+
+ Application
+ Unicode
+ true
+
+
+ Application
+ Unicode
+
+
+ Application
+ MultiByte
+ true
+
+
+ Application
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+
+
+
+ Disabled
+ ..\..\..\gmodule;%(AdditionalIncludeDirectories)
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+
+
+ true
+ Console
+ MachineX86
+
+
+
+
+ Disabled
+ ..\..\..\gmodule;%(AdditionalIncludeDirectories)
+ _DEBUG;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ ProgramDatabase
+ CompileAsC
+
+
+ true
+ Console
+ false
+
+
+ MachineX64
+
+
+
+
+ MaxSpeed
+ true
+ ..\..\..\gmodule;%(AdditionalIncludeDirectories)
+ %(PreprocessorDefinitions)
+ MultiThreadedDLL
+ true
+
+
+ Level3
+ ProgramDatabase
+
+
+ true
+ Console
+ true
+ true
+ MachineX86
+
+
+
+
+ ..\..\..\gmodule;%(AdditionalIncludeDirectories)
+ %(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+ CompileAsC
+
+
+ true
+ Console
+ true
+ true
+ false
+
+
+ MachineX64
+
+
+
+
+
+
+
+ {f3d1583c-5613-4809-bd98-7cc1c1276f92}
+ false
+
+
+ {12bca020-eabf-429e-876a-a476bc9c10c0}
+ false
+
+
+ {f172effc-e30f-4593-809e-db2024b1e753}
+ false
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/win32/vs10/gresource.vcxproj.filters b/build/win32/vs10/gresource.vcxproj.filters
new file mode 100644
index 000000000..b121704a2
--- /dev/null
+++ b/build/win32/vs10/gresource.vcxproj.filters
@@ -0,0 +1,14 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index e0f647214..bdf6f7337 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -125,10 +125,6 @@
{c8afb8c3-fffd-460f-bc13-9ac25d7b117c}
false
-
-
- {64e09909-5599-40c0-b808-27f55f7b823c}
- false
{015d69d0-8b42-438a-adae-052ac036e065}
@@ -138,6 +134,14 @@
{05041c63-f1c5-49ba-a7de-61ebb5307eaa}
false
+
+ {b0cdec7f-dce1-4f7e-b8a4-a3009c18fb2a}
+ false
+
+
+ {95a1571f-61be-4c51-be53-2f2dab280685}
+ false
+