diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/build/win32/vs10/gio.vcxproj.filtersin index 7aa119e64..d02903c91 100644 --- a/build/win32/vs10/gio.vcxproj.filtersin +++ b/build/win32/vs10/gio.vcxproj.filtersin @@ -1,51 +1,30 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "libgio.vs10.sourcefiles.filters" - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + +#include "libgio.vs10.sourcefiles.filters" + + + + Resource Files + + + + + Resource Files + + \ No newline at end of file diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin index f3f029845..68445dc61 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/build/win32/vs10/gio.vcxprojin @@ -1,222 +1,215 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F3D1583C-5613-4809-BD98-7CC1C1276F92} - gio - - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - false - true - false - - - - Disabled - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - CompileAsC - - - zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def - true - Windows - false - - - $(TargetDir)$(ProjectName)-2.0.lib - MachineX86 - - - - - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def - true - Windows - true - true - false - - - $(TargetDir)$(ProjectName)-2.0.lib - MachineX86 - - - - - Disabled - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def - true - Windows - false - - - $(TargetDir)$(ProjectName)-2.0.lib - MachineX64 - - - - - ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) - $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def - true - Windows - true - true - false - - - $(TargetDir)$(ProjectName)-2.0.lib - MachineX64 - - - -#include "libgio.vs10.sourcefiles" - - - - - - - - - - - - - - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - - - - - {12bca020-eabf-429e-876a-a476bc9c10c0} - false - - - {4214047c-f5c1-40b3-8369-5dced8c32770} - false - - - {f172effc-e30f-4593-809e-db2024b1e753} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F3D1583C-5613-4809-BD98-7CC1C1276F92} + gio + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + CompileAsC + + + zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + $(IntDir)gio.def + true + Windows + false + + + $(TargetDir)$(ProjectName)-2.0.lib + MachineX86 + + + + + ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + $(IntDir)gio.def + true + Windows + true + true + false + + + $(TargetDir)$(ProjectName)-2.0.lib + MachineX86 + + + + + Disabled + ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + $(IntDir)gio.def + true + Windows + false + + + $(TargetDir)$(ProjectName)-2.0.lib + MachineX64 + + + + + ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + $(IntDir)gio.def + true + Windows + true + true + false + + + $(TargetDir)$(ProjectName)-2.0.lib + MachineX64 + + + +#include "libgio.vs10.sourcefiles" + + + + + + + Generating gio.def + $(GlibGenerateGioDef) + $(IntDir)gio.def;%(Outputs) + Generating gio.def + $(GlibGenerateGioDef) + $(IntDir)gio.def;%(Outputs) + Generating gio.def + $(GlibGenerateGioDef) + $(IntDir)gio.def;%(Outputs) + Generating gio.def + $(GlibGenerateGioDef) + $(IntDir)gio.def;%(Outputs) + + + + + {12bca020-eabf-429e-876a-a476bc9c10c0} + false + + + {4214047c-f5c1-40b3-8369-5dced8c32770} + false + + + {f172effc-e30f-4593-809e-db2024b1e753} + false + + + + + \ No newline at end of file diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin index 4304aa66a..f5a70e00b 100644 --- a/build/win32/vs9/gio.vcprojin +++ b/build/win32/vs9/gio.vcprojin @@ -1,232 +1,225 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "libgio.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "libgio.sourcefiles" + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gio/Makefile.am b/gio/Makefile.am index f8bfe9e55..1e6d59082 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -256,6 +256,7 @@ win32_actual_sources = \ win32_more_sources_for_vcproj = \ gwin32appinfo.c \ + gregistrysettingsbackend.c \ win32/gwin32directorymonitor.c \ win32/gwinhttpfile.c \ win32/gwinhttpfileinputstream.c \ @@ -637,7 +638,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10 cp $$d/$$f $(distdir) || exit 1; done ../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin - for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \ + for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ case $$F in \ gunix*.c|gdesktopappinfo.c) ;; \ *.c) echo ' ' \ @@ -648,7 +649,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10 rm libgio.sourcefiles ../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin - for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \ + for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ case $$F in \ gunix*.c|gdesktopappinfo.c) ;; \ *.c) echo ' ' \ @@ -659,7 +660,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10 rm libgio.vs10.sourcefiles ../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin - for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \ + for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ case $$F in \ gunix*.c|gdesktopappinfo.c) ;; \ *.c) echo ' Source Files' \