From 810a296d4244f061f037445f39b8900fb67ba3e8 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 24 Apr 2012 00:03:33 +0800 Subject: [PATCH] Visual C++ projects: Clean/fix up Clean/fix up the Preprocessor Definitions for the various projects, where we purge out the unneeded macros and add _DEBUG to the Debug builds of various projects that somehow lacked this. This will also fix the GIO build under Visual C++ 2008, as the _DEBUG macro in the release builds will cause a debug entry to appear in its manifest file during the build, which will cause GIO-using applications to fail to run on systems not running Visual C++/Studio 2008 due to its embedding of a badly-generated manifest file. --- build/win32/vs10/gio.vcxprojin | 8 ++++---- build/win32/vs10/glib-genmarshal.vcxproj | 8 ++++---- build/win32/vs10/glib.vcxprojin | 16 ++++++++-------- build/win32/vs10/gmodule.vcxproj | 8 ++++---- build/win32/vs10/gobject.vcxprojin | 8 ++++---- .../vs10/gspawn-win32-helper-console.vcxproj | 4 ++-- build/win32/vs10/gspawn-win32-helper.vcxproj | 4 ++-- build/win32/vs10/gthread.vcxproj | 8 ++++---- build/win32/vs9/gio.vcprojin | 8 ++++---- build/win32/vs9/glib-genmarshal.vcproj | 8 ++++---- build/win32/vs9/glib.vcprojin | 16 ++++++++-------- build/win32/vs9/gmodule.vcproj | 8 ++++---- build/win32/vs9/gobject.vcprojin | 8 ++++---- .../win32/vs9/gspawn-win32-helper-console.vcproj | 4 ++-- build/win32/vs9/gspawn-win32-helper.vcproj | 4 ++-- build/win32/vs9/gthread.vcproj | 8 ++++---- 16 files changed, 64 insertions(+), 64 deletions(-) diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin index bf43db564..9b83fe68c 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/build/win32/vs10/gio.vcxprojin @@ -71,7 +71,7 @@ Disabled ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -97,7 +97,7 @@ ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) MultiThreadedDLL @@ -124,7 +124,7 @@ Disabled ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -150,7 +150,7 @@ ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GLib-GIO";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/glib-genmarshal.vcxproj b/build/win32/vs10/glib-genmarshal.vcxproj index 85c1210d4..ed1244a04 100644 --- a/build/win32/vs10/glib-genmarshal.vcxproj +++ b/build/win32/vs10/glib-genmarshal.vcxproj @@ -71,7 +71,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -92,7 +92,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL @@ -114,7 +114,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -135,7 +135,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin index da7486ddb..d6903e87b 100644 --- a/build/win32/vs10/glib.vcxprojin +++ b/build/win32/vs10/glib.vcxprojin @@ -129,7 +129,7 @@ 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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) + _DEBUG;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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -155,7 +155,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;USE_SYSTEM_PCRE;%(PreprocessorDefinitions) + _DEBUG;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;USE_SYSTEM_PCRE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -181,7 +181,7 @@ 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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) + _DEBUG;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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -207,7 +207,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;USE_SYSTEM_PCRE;%(PreprocessorDefinitions) + _DEBUG;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";G_ENABLE_DEBUG;USE_SYSTEM_PCRE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -232,7 +232,7 @@ - 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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) + 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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) MultiThreadedDLL @@ -257,7 +257,7 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";USE_SYSTEM_PCRE;%(PreprocessorDefinitions) + GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";USE_SYSTEM_PCRE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -282,7 +282,7 @@ - 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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) + 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;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;%(PreprocessorDefinitions) MultiThreadedDLL @@ -307,7 +307,7 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";USE_SYSTEM_PCRE;%(PreprocessorDefinitions) + GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib";USE_SYSTEM_PCRE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gmodule.vcxproj b/build/win32/vs10/gmodule.vcxproj index 404c45ca5..aa6517573 100644 --- a/build/win32/vs10/gmodule.vcxproj +++ b/build/win32/vs10/gmodule.vcxproj @@ -71,7 +71,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -95,7 +95,7 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -144,7 +144,7 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GModule";%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gobject.vcxprojin b/build/win32/vs10/gobject.vcxprojin index 9613053b0..b0ec950e4 100644 --- a/build/win32/vs10/gobject.vcxprojin +++ b/build/win32/vs10/gobject.vcxprojin @@ -71,7 +71,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + _DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -96,7 +96,7 @@ false - WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) MultiThreadedDLL @@ -123,7 +123,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + _DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -148,7 +148,7 @@ false - WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gspawn-win32-helper-console.vcxproj b/build/win32/vs10/gspawn-win32-helper-console.vcxproj index b9ea865cf..105619443 100644 --- a/build/win32/vs10/gspawn-win32-helper-console.vcxproj +++ b/build/win32/vs10/gspawn-win32-helper-console.vcxproj @@ -71,7 +71,7 @@ Disabled - %(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ Disabled - %(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL diff --git a/build/win32/vs10/gspawn-win32-helper.vcxproj b/build/win32/vs10/gspawn-win32-helper.vcxproj index 4357a8da3..f900a7a70 100644 --- a/build/win32/vs10/gspawn-win32-helper.vcxproj +++ b/build/win32/vs10/gspawn-win32-helper.vcxproj @@ -71,7 +71,7 @@ Disabled - %(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -93,7 +93,7 @@ Disabled - %(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL diff --git a/build/win32/vs10/gthread.vcxproj b/build/win32/vs10/gthread.vcxproj index aadba3335..d31da8108 100644 --- a/build/win32/vs10/gthread.vcxproj +++ b/build/win32/vs10/gthread.vcxproj @@ -71,7 +71,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -95,7 +95,7 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -144,7 +144,7 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GThread";%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin index 48b9123d8..41352e068 100644 --- a/build/win32/vs9/gio.vcprojin +++ b/build/win32/vs9/gio.vcprojin @@ -28,7 +28,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../gio,../../../gmodule" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\"GLib-GIO\";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\"" + PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\"GLib-GIO\";GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\"" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -61,7 +61,7 @@