From daee5fc5569c1807f5c8dae502d305eb06141e8b Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Fri, 17 Nov 2017 04:37:29 +0100 Subject: gpg4libre: add glib2 dependency for Windows Change-Id: Ib6b5393323a4dbfe94ea89689ac9170f8afa3899 Reviewed-on: https://gerrit.libreoffice.org/44856 Reviewed-by: Siegmund Gorr Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- Makefile.fetch | 1 + configure.ac | 5 +- download.lst | 2 + external/Module_external.mk | 1 + external/glib2/ExternalPackage_glib2.mk | 14 + external/glib2/ExternalProject_glib2.mk | 33 + external/glib2/Makefile | 7 + external/glib2/Module_glib2.mk | 18 + external/glib2/README | 1 + external/glib2/UnpackedTarball_glib2.mk | 21 + external/glib2/glib-disable-libintl.patch.1 | 26 + external/glib2/glib-fix-broken-includes.patch.1 | 24 + external/glib2/glib-remove-wgetmainargs.patch.1 | 83 + external/glib2/glib-upgrade-vs12.patch.1 | 5509 +++++++++++++++++++++++ 14 files changed, 5744 insertions(+), 1 deletion(-) create mode 100644 external/glib2/ExternalPackage_glib2.mk create mode 100644 external/glib2/ExternalProject_glib2.mk create mode 100644 external/glib2/Makefile create mode 100644 external/glib2/Module_glib2.mk create mode 100644 external/glib2/README create mode 100644 external/glib2/UnpackedTarball_glib2.mk create mode 100644 external/glib2/glib-disable-libintl.patch.1 create mode 100644 external/glib2/glib-fix-broken-includes.patch.1 create mode 100644 external/glib2/glib-remove-wgetmainargs.patch.1 create mode 100644 external/glib2/glib-upgrade-vs12.patch.1 diff --git a/Makefile.fetch b/Makefile.fetch index 3944ac75c7b2..a88a508b3fcb 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -128,6 +128,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ $(call fetch_Optional,EPOXY,EPOXY_TARBALL) \ $(call fetch_Optional,GLM,GLM_TARBALL) \ + $(call fetch_Optional,GLIB2,GLIB2_TARBALL) \ $(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \ $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ diff --git a/configure.ac b/configure.ac index 92cbf7eedc6d..0d2b8aca01a6 100644 --- a/configure.ac +++ b/configure.ac @@ -10151,8 +10151,11 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) else AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY]) + BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" + if test "$_os" = "WINNT"; then + BUILD_TYPE="$BUILD_TYPE GLIB2" + fi GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src" GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error" diff --git a/download.lst b/download.lst index 18bbeefbd5ee..98dd3526f783 100644 --- a/download.lst +++ b/download.lst @@ -78,6 +78,8 @@ export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d909 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 export FREETYPE_TARBALL := freetype-2.8.1.tar.bz2 +export GLIB2_SHA256SUM := 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353 +export GLIB2_TARBALL := glib-2.28.8.tar.xz export GLM_SHA256SUM := d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip export GPGME_SHA256SUM := 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb diff --git a/external/Module_external.mk b/external/Module_external.mk index 8f87fe70a5b3..498d95bef4ca 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ $(call gb_Helper_optional,FREEHAND,libfreehand) \ $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GLIB2,glib2) \ $(call gb_Helper_optional,GLM,glm) \ $(call gb_Helper_optional,GPGMEPP,gpgme) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ diff --git a/external/glib2/ExternalPackage_glib2.mk b/external/glib2/ExternalPackage_glib2.mk new file mode 100644 index 000000000000..d527feeceb13 --- /dev/null +++ b/external/glib2/ExternalPackage_glib2.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,glib2,glib2)) + +$(eval $(call gb_ExternalPackage_use_external_project,glib2,glib2)) + +# vim: set noet sw=4 ts=4: diff --git a/external/glib2/ExternalProject_glib2.mk b/external/glib2/ExternalProject_glib2.mk new file mode 100644 index 000000000000..9510d5a3a992 --- /dev/null +++ b/external/glib2/ExternalProject_glib2.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,glib2)) + +ifeq ($(OS),WNT) +$(eval $(call gb_ExternalProject_register_targets,glib2,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_external,glib2,zlib)) + +# get local copies of zlib.h & zlib.lib (glib imposes fixed dir +# structure on that), run native msbuild for binaries then +$(call gb_ExternalProject_get_state_target,glib2,build): + $(call gb_ExternalProject_run,build,\ + mkdir -p $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/etc/include && \ + cp $(WORKDIR)/UnpackedTarball/zlib/zlib.h $(WORKDIR)/UnpackedTarball/zlib/zconf.h */etc/include/ && \ + mkdir -p $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/etc/lib && \ + cp $(WORKDIR)/LinkTarget/StaticLibrary/zlib.lib */etc/lib/ && \ + msbuild.exe glib.sln \ + /p:GlibEtcInstallRoot=./$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/etc \ + /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + ,build/win32/vs10) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/glib2/Makefile b/external/glib2/Makefile new file mode 100644 index 000000000000..e4968cf85fb6 --- /dev/null +++ b/external/glib2/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/glib2/Module_glib2.mk b/external/glib2/Module_glib2.mk new file mode 100644 index 000000000000..42e2676c491a --- /dev/null +++ b/external/glib2/Module_glib2.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,glib2)) + +$(eval $(call gb_Module_add_targets,glib2,\ + ExternalPackage_glib2 \ + ExternalProject_glib2 \ + UnpackedTarball_glib2 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/glib2/README b/external/glib2/README new file mode 100644 index 000000000000..636459d3f1ab --- /dev/null +++ b/external/glib2/README @@ -0,0 +1 @@ +GLib2 lib, for gpgme on Windows, from [https://github.com/GNOME/glib/releases] diff --git a/external/glib2/UnpackedTarball_glib2.mk b/external/glib2/UnpackedTarball_glib2.mk new file mode 100644 index 000000000000..d058f1cdd896 --- /dev/null +++ b/external/glib2/UnpackedTarball_glib2.mk @@ -0,0 +1,21 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,glib2)) + +$(eval $(call gb_UnpackedTarball_set_tarball,glib2,$(GLIB2_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_patches,glib2,\ + external/glib2/glib-upgrade-vs12.patch.1 \ + external/glib2/glib-disable-libintl.patch.1 \ + external/glib2/glib-fix-broken-includes.patch.1 \ + external/glib2/glib-remove-wgetmainargs.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/glib2/glib-disable-libintl.patch.1 b/external/glib2/glib-disable-libintl.patch.1 new file mode 100644 index 000000000000..2886c7fe4a90 --- /dev/null +++ b/external/glib2/glib-disable-libintl.patch.1 @@ -0,0 +1,26 @@ +diff -ur glib2.org/build/win32/vs10/glib.props glib2/build/win32/vs10/glib.props +--- glib2.org/build/win32/vs10/glib.props 2017-11-16 23:53:51.710733000 +0100 ++++ glib2/build/win32/vs10/glib.props 2017-11-17 16:43:34.326253400 +0100 +@@ -464,10 +464,6 @@ + HAVE_CONFIG_H;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + +- +- intl.lib;%(AdditionalDependencies) +- $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) +- + + + if exist ..\..\..\config.h goto DONE_CONFIG_H +diff -ur glib2.org/config.h.win32 glib2/config.h.win32 +--- glib2.org/config.h.win32 2017-11-16 23:53:51.523015800 +0100 ++++ glib2/config.h.win32 2017-11-17 16:37:29.286580700 +0100 +@@ -26,7 +26,7 @@ + /* #undef ENABLE_GC_FRIENDLY_DEFAULT */ + + /* always defined to indicate that i18n is enabled */ +-#define ENABLE_NLS 1 ++/* #define ENABLE_NLS 1 */ + + /* include GRegex */ + #define ENABLE_REGEX /**/ diff --git a/external/glib2/glib-fix-broken-includes.patch.1 b/external/glib2/glib-fix-broken-includes.patch.1 new file mode 100644 index 000000000000..c8ec25aaf38e --- /dev/null +++ b/external/glib2/glib-fix-broken-includes.patch.1 @@ -0,0 +1,24 @@ +diff -ur glib2.org/build/win32/vs10/glib.props glib2/build/win32/vs10/glib.props +--- glib2.org/build/win32/vs10/glib.props 2017-11-18 00:24:16.017422400 +0100 ++++ glib2/build/win32/vs10/glib.props 2017-11-18 00:26:26.886453600 +0100 +@@ -460,7 +460,7 @@ + + + +- ..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) ++ ..\..\..;..\..\..\glib;..\..\..\gmodule;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + +diff -ur glib2.org/glib/gi18n.h glib2/glib/gi18n.h +--- glib2.org/glib/gi18n.h 2017-11-18 00:24:17.221625400 +0100 ++++ glib2/glib/gi18n.h 2017-11-18 00:35:17.729524800 +0100 +@@ -22,7 +22,7 @@ + + #include + +-#include ++#include + #include + + #define _(String) gettext (String) diff --git a/external/glib2/glib-remove-wgetmainargs.patch.1 b/external/glib2/glib-remove-wgetmainargs.patch.1 new file mode 100644 index 000000000000..28555d71257f --- /dev/null +++ b/external/glib2/glib-remove-wgetmainargs.patch.1 @@ -0,0 +1,83 @@ +From 3cc349b04e76880a9d2f3c3d2195d171e110f66c Mon Sep 17 00:00:00 2001 +From: TingPing +Date: Sat, 20 Dec 2014 18:39:00 -0500 +Subject: [PATCH] win32: Replace usage of __wgetmainargs() + +It was an internal function that has been removed with VS 2015 + +Use g_win32_get_command_line() or CommandLineToArgvW() directly. + +https://bugzilla.gnome.org/show_bug.cgi?id=741822 +--- + glib/gspawn-win32-helper.c | 20 +++---------------- + glib/gspawn.c | 9 ++------- + 3 files changed, 22 insertions(+), 56 deletions(-) + +diff -ur glib2.org/glib/gspawn.c glib2/glib/gspawn.c +--- glib2.org/glib/gspawn.c 2017-11-16 23:53:53.619191200 +0100 ++++ glib2/glib/gspawn.c 2017-11-17 21:48:54.905453400 +0100 +@@ -480,13 +480,8 @@ + * main(). wmain() has a wide character argument vector as parameter. + * + * At least currently, mingw doesn't support wmain(), so if you use +- * mingw to develop the spawned program, it will have to call the +- * undocumented function __wgetmainargs() to get the wide character +- * argument vector and environment. See gspawn-win32-helper.c in the +- * GLib sources or init.c in the mingw runtime sources for a prototype +- * for that function. Alternatively, you can retrieve the Win32 system +- * level wide character command line passed to the spawned program +- * using the GetCommandLineW() function. ++ * mingw to develop the spawned program, it should call ++ * g_win32_get_command_line() to get arguments in UTF-8. + * + * On Windows the low-level child process creation API + * CreateProcess() doesn't use argument vectors, +diff -ur glib2.org/glib/gspawn-win32-helper.c glib2/glib/gspawn-win32-helper.c +--- glib2.org/glib/gspawn-win32-helper.c 2017-11-16 23:53:53.556618800 +0100 ++++ glib2/glib/gspawn-win32-helper.c 2017-11-17 21:48:16.887044400 +0100 +@@ -54,20 +54,6 @@ + * away in the global __argc and __argv by the C runtime startup code. + */ + +-/* Info peeked from mingw runtime's source code. __wgetmainargs() is a +- * function to get the program's argv in wide char format. +- */ +- +-typedef struct { +- int newmode; +-} _startupinfo; +- +-extern void __wgetmainargs(int *argc, +- wchar_t ***wargv, +- wchar_t ***wenviron, +- int expand_wildcards, +- _startupinfo *startupinfo); +- + /* Copy of protect_argv that handles wchar_t strings */ + + static gint +@@ -169,14 +155,13 @@ + gint argv_zero_offset = ARG_PROGRAM; + wchar_t **new_wargv; + int argc; +- wchar_t **wargv, **wenvp; +- _startupinfo si = { 0 }; ++ wchar_t **wargv; + char c; + + g_assert (__argc >= ARG_COUNT); + + /* Fetch the wide-char argument vector */ +- __wgetmainargs (&argc, &wargv, &wenvp, 0, &si); ++ wargv = CommandLineToArgvW (GetCommandLineW(), &argc); + + /* We still have the system codepage args in __argv. We can look + * at the first args in which gspawn-win32.c passes us flags and +@@ -329,5 +314,7 @@ + + read (helper_sync_fd, &c, 1); + ++ LocalFree (wargv); ++ + return 0; + } diff --git a/external/glib2/glib-upgrade-vs12.patch.1 b/external/glib2/glib-upgrade-vs12.patch.1 new file mode 100644 index 000000000000..bbdc03d9e41f --- /dev/null +++ b/external/glib2/glib-upgrade-vs12.patch.1 @@ -0,0 +1,5509 @@ +diff -ur glib2.org/build/win32/vs10/gio.vcxproj glib2/build/win32/vs10/gio.vcxproj +--- glib2.org/build/win32/vs10/gio.vcxproj 2017-11-16 23:53:51.742019200 +0100 ++++ glib2/build/win32/vs10/gio.vcxproj 2017-11-17 00:01:04.890703100 +0100 +@@ -1,367 +4,375 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {F3D1583C-5613-4809-BD98-7CC1C1276F92} +- gio +- +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- 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 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- 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 ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ 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 ++ ++ ++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gio.def ++ true ++ $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) ++ 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 ++ ++ ++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gio.def ++ true ++ $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) ++ 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 ++ ++ ++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gio.def ++ true ++ $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) ++ 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 ++ ++ ++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gio.def ++ true ++ $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 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 -ur glib2.org/build/win32/vs10/glib.vcxproj glib2/build/win32/vs10/glib.vcxproj +--- glib2.org/build/win32/vs10/glib.vcxproj 2017-11-16 23:53:51.710733000 +0100 ++++ glib2/build/win32/vs10/glib.vcxproj 2017-11-17 00:01:04.906346200 +0100 +@@ -1,541 +1,549 @@ +- +- +- +- +- Debug_ExtPCRE +- Win32 +- +- +- Debug_ExtPCRE +- x64 +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release_ExtPCRE +- Win32 +- +- +- Release_ExtPCRE +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {12BCA020-EABF-429E-876A-A476BC9C10C0} +- glib +- Win32Proj +- +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- DynamicLibrary +- MultiByte +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- DynamicLibrary +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- true +- true +- true +- false +- false +- false +- false +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- ws2_32.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- ws2_32.lib;pcred.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- ws2_32.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- ws2_32.lib;pcred.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- ws2_32.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- ws2_32.lib;pcre.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- ws2_32.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- ws2_32.lib;pcre.lib;%(AdditionalDependencies) +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)glib.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) +- +- +- +- +- +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- true +- true +- true +- true +- +- +- +- +- +- +- +- Generating glib.def +- $(GlibGenerateGlibDef) +- $(IntDir)glib.def;%(Outputs) +- Generating glib.def +- $(GlibGenerateGlibDefW64) +- $(IntDir)glib.def;%(Outputs) +- Generating glib.def +- $(GlibGenerateGlibDef) +- $(IntDir)glib.def;%(Outputs) +- Generating glib.def +- $(GlibGenerateGlibDefW64) +- $(IntDir)glib.def;%(Outputs) +- Generating glib.def +- $(GlibGenerateGlibDef) +- $(IntDir)glib.def;%(Outputs) +- Generating glib.def +- $(GlibGenerateGlibDefW64) +- $(IntDir)glib.def;%(Outputs) +- Generating glib.def +- $(GlibGenerateGlibDef) +- $(IntDir)glib.def;%(Outputs) +- Generating glib.def +- $(GlibGenerateGlibDefW64) +- $(IntDir)glib.def;%(Outputs) +- +- +- +- +- +- ++ ++ ++ ++ ++ Debug_ExtPCRE ++ Win32 ++ ++ ++ Debug_ExtPCRE ++ x64 ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release_ExtPCRE ++ Win32 ++ ++ ++ Release_ExtPCRE ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {12BCA020-EABF-429E-876A-A476BC9C10C0} ++ glib ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ true ++ true ++ true ++ false ++ false ++ false ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ ws2_32.lib;pcred.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ ws2_32.lib;pcred.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ ws2_32.lib;pcre.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ ws2_32.lib;pcre.lib;%(AdditionalDependencies) ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)glib.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ ++ ++ ++ ++ ++ Generating glib.def ++ $(GlibGenerateGlibDef) ++ $(IntDir)glib.def;%(Outputs) ++ Generating glib.def ++ $(GlibGenerateGlibDefW64) ++ $(IntDir)glib.def;%(Outputs) ++ Generating glib.def ++ $(GlibGenerateGlibDef) ++ $(IntDir)glib.def;%(Outputs) ++ Generating glib.def ++ $(GlibGenerateGlibDefW64) ++ $(IntDir)glib.def;%(Outputs) ++ Generating glib.def ++ $(GlibGenerateGlibDef) ++ $(IntDir)glib.def;%(Outputs) ++ Generating glib.def ++ $(GlibGenerateGlibDefW64) ++ $(IntDir)glib.def;%(Outputs) ++ Generating glib.def ++ $(GlibGenerateGlibDef) ++ $(IntDir)glib.def;%(Outputs) ++ Generating glib.def ++ $(GlibGenerateGlibDefW64) ++ $(IntDir)glib.def;%(Outputs) ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/glib-compile-schemas.vcxproj glib2/build/win32/vs10/glib-compile-schemas.vcxproj +--- glib2.org/build/win32/vs10/glib-compile-schemas.vcxproj 2017-11-16 23:53:51.726376100 +0100 ++++ glib2/build/win32/vs10/glib-compile-schemas.vcxproj 2017-11-17 00:01:04.921989300 +0100 +@@ -1,178 +1,182 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {015D69D0-8B42-438A-ADAE-052AC036E065} +- glibcompileschemas +- Win32Proj +- +- +- +- Application +- Unicode +- true +- +- +- Application +- Unicode +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- true +- false +- false +- +- +- +- Disabled +- ..\..\..\gmodule;%(AdditionalIncludeDirectories) +- _DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- +- +- true +- Console +- MachineX86 +- +- +- +- +- Disabled +- ..\..\..\gmodule;%(AdditionalIncludeDirectories) +- DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- false +- +- +- MachineX64 +- +- +- +- +- MaxSpeed +- ..\..\..\gmodule;%(AdditionalIncludeDirectories) +- true +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- true +- Console +- true +- true +- MachineX86 +- +- +- +- +- ..\..\..\gmodule;%(AdditionalIncludeDirectories) +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX64 +- +- +- +- +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- {f172effc-e30f-4593-809e-db2024b1e753} +- false +- +- +- {f3d1583c-5613-4809-bd98-7cc1c1276f92} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {015D69D0-8B42-438A-ADAE-052AC036E065} ++ glibcompileschemas ++ Win32Proj ++ ++ ++ ++ Application ++ Unicode ++ true ++ v140 ++ ++ ++ Application ++ Unicode ++ v140 ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ true ++ false ++ false ++ ++ ++ ++ Disabled ++ ..\..\..\gmodule;%(AdditionalIncludeDirectories) ++ _DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ ++ ++ true ++ Console ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ ..\..\..\gmodule;%(AdditionalIncludeDirectories) ++ DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ MaxSpeed ++ ..\..\..\gmodule;%(AdditionalIncludeDirectories) ++ true ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ true ++ Console ++ true ++ true ++ MachineX86 ++ ++ ++ ++ ++ ..\..\..\gmodule;%(AdditionalIncludeDirectories) ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ {f172effc-e30f-4593-809e-db2024b1e753} ++ false ++ ++ ++ {f3d1583c-5613-4809-bd98-7cc1c1276f92} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/glib-genmarshal.vcxproj glib2/build/win32/vs10/glib-genmarshal.vcxproj +--- glib2.org/build/win32/vs10/glib-genmarshal.vcxproj 2017-11-16 23:53:51.742019200 +0100 ++++ glib2/build/win32/vs10/glib-genmarshal.vcxproj 2017-11-17 00:01:04.921989300 +0100 +@@ -1,170 +1,174 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {BD12E835-5C52-4E5D-8234-1C579F33E27A} +- glibgenmarshal +- Win32Proj +- +- +- +- Application +- Unicode +- true +- +- +- Application +- MultiByte +- +- +- Application +- Unicode +- true +- +- +- Application +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- false +- true +- false +- +- +- +- Disabled +- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- true +- Console +- false +- +- +- MachineX86 +- +- +- +- +- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX86 +- +- +- +- +- Disabled +- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- false +- +- +- MachineX64 +- +- +- +- +- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX64 +- +- +- +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {BD12E835-5C52-4E5D-8234-1C579F33E27A} ++ glibgenmarshal ++ Win32Proj ++ ++ ++ ++ Application ++ Unicode ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ Application ++ Unicode ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ false ++ true ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ true ++ Console ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/gmodule.vcxproj glib2/build/win32/vs10/gmodule.vcxproj +--- glib2.org/build/win32/vs10/gmodule.vcxproj 2017-11-16 23:53:51.710733000 +0100 ++++ glib2/build/win32/vs10/gmodule.vcxproj 2017-11-17 00:01:04.937632400 +0100 +@@ -1,201 +1,205 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {4214047C-F5C1-40B3-8369-5DCED8C32770} +- gmodule +- Win32Proj +- +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- false +- true +- false +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gmodule.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gmodule.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gmodule.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gmodule.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- Generating gmodule.def +- $(GlibGenerateGmoduleDef) +- $(IntDir)gmodule.def;%(Outputs) +- Generating gmodule.def +- $(GlibGenerateGmoduleDefW64) +- $(IntDir)gmodule.def;%(Outputs) +- Generating gmodule.def +- $(GlibGenerateGmoduleDef) +- $(IntDir)gmodule.def;%(Outputs) +- Generating gmodule.def +- $(GlibGenerateGmoduleDefW64) +- $(IntDir)gmodule.def;%(Outputs) +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {4214047C-F5C1-40B3-8369-5DCED8C32770} ++ gmodule ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ false ++ true ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gmodule.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gmodule.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gmodule.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gmodule.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Generating gmodule.def ++ $(GlibGenerateGmoduleDef) ++ $(IntDir)gmodule.def;%(Outputs) ++ Generating gmodule.def ++ $(GlibGenerateGmoduleDefW64) ++ $(IntDir)gmodule.def;%(Outputs) ++ Generating gmodule.def ++ $(GlibGenerateGmoduleDef) ++ $(IntDir)gmodule.def;%(Outputs) ++ Generating gmodule.def ++ $(GlibGenerateGmoduleDefW64) ++ $(IntDir)gmodule.def;%(Outputs) ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/gobject.vcxproj glib2/build/win32/vs10/gobject.vcxproj +--- glib2.org/build/win32/vs10/gobject.vcxproj 2017-11-16 23:53:51.710733000 +0100 ++++ glib2/build/win32/vs10/gobject.vcxproj 2017-11-17 00:01:04.937632400 +0100 +@@ -1,223 +1,227 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {F172EFFC-E30F-4593-809E-DB2024B1E753} +- gobject +- Win32Proj +- +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- false +- true +- false +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gobject.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- false +- WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gobject.def +- true +- Windows +- true +- true +- +- +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gobject.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- false +- WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- $(IntDir)gobject.def +- true +- Windows +- true +- true +- +- +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- Generating gobject.def +- $(GlibGenerateGobjectDef) +- $(IntDir)gobject.def;%(Outputs) +- Generating gobject.def +- $(GlibGenerateGobjectDef) +- $(IntDir)gobject.def;%(Outputs) +- Generating gobject.def +- $(GlibGenerateGobjectDef) +- $(IntDir)gobject.def;%(Outputs) +- Generating gobject.def +- $(GlibGenerateGobjectDef) +- $(IntDir)gobject.def;%(Outputs) +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- {c8afb8c3-fffd-460f-bc13-9ac25d7b117c} +- false +- +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {F172EFFC-E30F-4593-809E-DB2024B1E753} ++ gobject ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ false ++ true ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gobject.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ false ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gobject.def ++ true ++ Windows ++ true ++ true ++ ++ ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gobject.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ false ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ $(IntDir)gobject.def ++ true ++ Windows ++ true ++ true ++ ++ ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Generating gobject.def ++ $(GlibGenerateGobjectDef) ++ $(IntDir)gobject.def;%(Outputs) ++ Generating gobject.def ++ $(GlibGenerateGobjectDef) ++ $(IntDir)gobject.def;%(Outputs) ++ Generating gobject.def ++ $(GlibGenerateGobjectDef) ++ $(IntDir)gobject.def;%(Outputs) ++ Generating gobject.def ++ $(GlibGenerateGobjectDef) ++ $(IntDir)gobject.def;%(Outputs) ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ {c8afb8c3-fffd-460f-bc13-9ac25d7b117c} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/gsettings.vcxproj glib2/build/win32/vs10/gsettings.vcxproj +--- glib2.org/build/win32/vs10/gsettings.vcxproj 2017-11-16 23:53:51.742019200 +0100 ++++ glib2/build/win32/vs10/gsettings.vcxproj 2017-11-17 00:01:04.953275500 +0100 +@@ -1,174 +1,178 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {05041C63-F1C5-49BA-A7DE-61EBB5307EAA} +- gsettings +- Win32Proj +- +- +- +- Application +- Unicode +- true +- +- +- Application +- Unicode +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- true +- false +- false +- +- +- +- Disabled +- _DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- +- +- true +- Console +- MachineX86 +- +- +- +- +- Disabled +- DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- false +- +- +- MachineX64 +- +- +- +- +- MaxSpeed +- true +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- true +- +- +- Level3 +- ProgramDatabase +- +- +- %(AdditionalDependencies) +- true +- Console +- true +- true +- MachineX86 +- +- +- +- +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX64 +- +- +- +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- {f172effc-e30f-4593-809e-db2024b1e753} +- false +- +- +- {f3d1583c-5613-4809-bd98-7cc1c1276f92} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {05041C63-F1C5-49BA-A7DE-61EBB5307EAA} ++ gsettings ++ Win32Proj ++ ++ ++ ++ Application ++ Unicode ++ true ++ v140 ++ ++ ++ Application ++ Unicode ++ v140 ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ true ++ false ++ false ++ ++ ++ ++ Disabled ++ _DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ ++ ++ true ++ Console ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ MaxSpeed ++ true ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ %(AdditionalDependencies) ++ true ++ Console ++ true ++ true ++ MachineX86 ++ ++ ++ ++ ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ {f172effc-e30f-4593-809e-db2024b1e753} ++ false ++ ++ ++ {f3d1583c-5613-4809-bd98-7cc1c1276f92} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/gspawn-win32-helper.vcxproj glib2/build/win32/vs10/gspawn-win32-helper.vcxproj +--- glib2.org/build/win32/vs10/gspawn-win32-helper.vcxproj 2017-11-16 23:53:51.726376100 +0100 ++++ glib2/build/win32/vs10/gspawn-win32-helper.vcxproj 2017-11-17 00:01:04.953275500 +0100 +@@ -1,172 +1,176 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {289240E7-E167-47CE-A20C-58D852E520BA} +- gspawnwin32helper +- Win32Proj +- +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- true +- false +- false +- +- +- +- Disabled +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- true +- Windows +- false +- +- +- MachineX86 +- +- +- +- +- Disabled +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)gspawn-win64-helper.exe +- true +- Windows +- false +- +- +- MachineX64 +- +- +- +- +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)gspawn-win64-helper.exe +- true +- Windows +- true +- true +- false +- +- +- MachineX86 +- +- +- +- +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Windows +- true +- true +- false +- +- +- MachineX64 +- +- +- +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {289240E7-E167-47CE-A20C-58D852E520BA} ++ gspawnwin32helper ++ Win32Proj ++ ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ true ++ false ++ false ++ ++ ++ ++ Disabled ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ true ++ Windows ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)gspawn-win64-helper.exe ++ true ++ Windows ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)gspawn-win64-helper.exe ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/gspawn-win32-helper-console.vcxproj glib2/build/win32/vs10/gspawn-win32-helper-console.vcxproj +--- glib2.org/build/win32/vs10/gspawn-win32-helper-console.vcxproj 2017-11-16 23:53:51.695089900 +0100 ++++ glib2/build/win32/vs10/gspawn-win32-helper-console.vcxproj 2017-11-17 00:01:04.968918600 +0100 +@@ -1,172 +1,176 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {E40E8A7E-7CAE-4659-9B8B-BC38898E3074} +- gspawnwin32helperconsole +- Win32Proj +- +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- false +- true +- false +- +- +- +- Disabled +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- true +- Console +- false +- +- +- MachineX86 +- +- +- +- +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX86 +- +- +- +- +- Disabled +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)gspawn-win64-helper-console.exe +- true +- Console +- false +- +- +- MachineX64 +- +- +- +- +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)gspawn-win64-helper-console.exe +- true +- Console +- true +- true +- false +- +- +- MachineX64 +- +- +- +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {E40E8A7E-7CAE-4659-9B8B-BC38898E3074} ++ gspawnwin32helperconsole ++ Win32Proj ++ ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ false ++ true ++ false ++ ++ ++ ++ Disabled ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ true ++ Console ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)gspawn-win64-helper-console.exe ++ true ++ Console ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)gspawn-win64-helper-console.exe ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/gthread.vcxproj glib2/build/win32/vs10/gthread.vcxproj +--- glib2.org/build/win32/vs10/gthread.vcxproj 2017-11-16 23:53:51.726376100 +0100 ++++ glib2/build/win32/vs10/gthread.vcxproj 2017-11-17 00:01:04.968918600 +0100 +@@ -1,188 +1,192 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} +- gthread +- Win32Proj +- +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- DynamicLibrary +- MultiByte +- true +- +- +- DynamicLibrary +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- false +- true +- false +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- ../../../gthread/gthread.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- ../../../gthread/gthread.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX86 +- +- +- +- +- Disabled +- WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- ../../../gthread/gthread.def +- true +- Windows +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll +- ../../../gthread/gthread.def +- true +- Windows +- true +- true +- false +- +- +- $(TargetDir)$(ProjectName)-2.0.lib +- MachineX64 +- +- +- +- +- +- +- +- +- +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C} ++ gthread ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ true ++ v140 ++ ++ ++ DynamicLibrary ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ false ++ true ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ ../../../gthread/gthread.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ ../../../gthread/gthread.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ ../../../gthread/gthread.def ++ true ++ Windows ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll ++ ../../../gthread/gthread.def ++ true ++ Windows ++ true ++ true ++ false ++ ++ ++ $(TargetDir)$(ProjectName)-2.0.lib ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/install.vcxproj glib2/build/win32/vs10/install.vcxproj +--- glib2.org/build/win32/vs10/install.vcxproj 2017-11-16 23:53:51.726376100 +0100 ++++ glib2/build/win32/vs10/install.vcxproj 2017-11-17 00:01:04.984561700 +0100 +@@ -1,145 +1,149 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {2093D218-190E-4194-9421-3BA7CBF33B10} +- install +- Win32Proj +- +- +- +- Utility +- MultiByte +- true +- +- +- Utility +- MultiByte +- +- +- Utility +- MultiByte +- true +- +- +- Utility +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- $(GlibEtcInstallRoot)\ +- +- $(GlibEtcInstallRoot)\ +- +- $(GlibEtcInstallRoot)\ +- +- $(GlibEtcInstallRoot)\ +- +- +- +- +- $(GlibDoInstall) +- +- +- +- +- $(GlibDoInstall) +- +- +- +- +- $(GlibDoInstall) +- +- +- +- +- $(GlibDoInstall) +- +- +- +- +- {f3d1583c-5613-4809-bd98-7cc1c1276f92} +- false +- +- +- {bd12e835-5c52-4e5d-8234-1c579f33e27a} +- false +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- {4214047c-f5c1-40b3-8369-5dced8c32770} +- false +- +- +- {f172effc-e30f-4593-809e-db2024b1e753} +- false +- +- +- {e40e8a7e-7cae-4659-9b8b-bc38898e3074} +- false +- +- +- {289240e7-e167-47ce-a20c-58d852e520ba} +- false +- +- +- {c8afb8c3-fffd-460f-bc13-9ac25d7b117c} +- false +- +- +- {64e09909-5599-40c0-b808-27f55f7b823c} +- false +- +- +- {015d69d0-8b42-438a-adae-052ac036e065} +- false +- +- +- {05041c63-f1c5-49ba-a7de-61ebb5307eaa} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {2093D218-190E-4194-9421-3BA7CBF33B10} ++ install ++ Win32Proj ++ ++ ++ ++ Utility ++ MultiByte ++ true ++ v140 ++ ++ ++ Utility ++ MultiByte ++ v140 ++ ++ ++ Utility ++ MultiByte ++ true ++ v140 ++ ++ ++ Utility ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ $(GlibEtcInstallRoot)\ ++ ++ $(GlibEtcInstallRoot)\ ++ ++ $(GlibEtcInstallRoot)\ ++ ++ $(GlibEtcInstallRoot)\ ++ ++ ++ ++ ++ $(GlibDoInstall) ++ ++ ++ ++ ++ $(GlibDoInstall) ++ ++ ++ ++ ++ $(GlibDoInstall) ++ ++ ++ ++ ++ $(GlibDoInstall) ++ ++ ++ ++ ++ {f3d1583c-5613-4809-bd98-7cc1c1276f92} ++ false ++ ++ ++ {bd12e835-5c52-4e5d-8234-1c579f33e27a} ++ false ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ {4214047c-f5c1-40b3-8369-5dced8c32770} ++ false ++ ++ ++ {f172effc-e30f-4593-809e-db2024b1e753} ++ false ++ ++ ++ {e40e8a7e-7cae-4659-9b8b-bc38898e3074} ++ false ++ ++ ++ {289240e7-e167-47ce-a20c-58d852e520ba} ++ false ++ ++ ++ {c8afb8c3-fffd-460f-bc13-9ac25d7b117c} ++ false ++ ++ ++ {64e09909-5599-40c0-b808-27f55f7b823c} ++ false ++ ++ ++ {015d69d0-8b42-438a-adae-052ac036e065} ++ false ++ ++ ++ {05041c63-f1c5-49ba-a7de-61ebb5307eaa} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file +diff -ur glib2.org/build/win32/vs10/testglib.vcxproj glib2/build/win32/vs10/testglib.vcxproj +--- glib2.org/build/win32/vs10/testglib.vcxproj 2017-11-16 23:53:51.726376100 +0100 ++++ glib2/build/win32/vs10/testglib.vcxproj 2017-11-17 00:01:04.984561700 +0100 +@@ -1,170 +1,174 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {64E09909-5599-40C0-B808-27F55F7B823C} +- testglib +- Win32Proj +- +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- Application +- MultiByte +- true +- +- +- Application +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- true +- false +- true +- false +- +- +- +- Disabled +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- EditAndContinue +- CompileAsC +- +- +- true +- Console +- false +- +- +- MachineX86 +- +- +- +- +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX86 +- +- +- +- +- Disabled +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- true +- EnableFastChecks +- MultiThreadedDebugDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- false +- +- +- MachineX64 +- +- +- +- +- _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL +- +- +- Level3 +- ProgramDatabase +- CompileAsC +- +- +- true +- Console +- true +- true +- false +- +- +- MachineX64 +- +- +- +- +- +- +- +- {12bca020-eabf-429e-876a-a476bc9c10c0} +- false +- +- +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {64E09909-5599-40C0-B808-27F55F7B823C} ++ testglib ++ Win32Proj ++ ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ Application ++ MultiByte ++ true ++ v140 ++ ++ ++ Application ++ MultiByte ++ v140 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ true ++ false ++ true ++ false ++ ++ ++ ++ Disabled ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ EditAndContinue ++ CompileAsC ++ ++ ++ true ++ Console ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ Disabled ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ _CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsC ++ ++ ++ true ++ Console ++ true ++ true ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ {12bca020-eabf-429e-876a-a476bc9c10c0} ++ false ++ ++ ++ ++ ++ + +\ No newline at end of file -- cgit