From 7e24ad52ca69b81f9914c9d182fe3285d77bb76f Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Mon, 15 Sep 2008 14:04:51 +0000
Subject: [PATCH] Update to match the Makefile.am files. Drop G*_EXPORTS from

2008-09-15  Tor Lillqvist  <tml@novell.com>

	* win32/vs8/*.vcproj: Update to match the Makefile.am files. Drop
	G*_EXPORTS from PreprocessorDefinitions, nothing looks for such
	macros. Add G_DISABLE_DEPRECATED. Add PCRE_STATIC for glib to
	avoid exporting the pcre functions. Add G_LOG_DOMAIN for gobject.


svn path=/trunk/; revision=7484
---
 build/ChangeLog                | 7 +++++++
 build/win32/vs8/glib.vcproj    | 4 ++--
 build/win32/vs8/gmodule.vcproj | 4 ++--
 build/win32/vs8/gobject.vcproj | 4 ++--
 build/win32/vs8/gthread.vcproj | 4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build/ChangeLog b/build/ChangeLog
index 1ba8ae2..2732bbc 100644
--- a/build/ChangeLog
+++ b/build/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-15  Tor Lillqvist  <tml@novell.com>
+
+	* win32/vs8/*.vcproj: Update to match the Makefile.am files. Drop
+	G*_EXPORTS from PreprocessorDefinitions, nothing looks for such
+	macros. Add G_DISABLE_DEPRECATED. Add PCRE_STATIC for glib to
+	avoid exporting the pcre functions. Add G_LOG_DOMAIN for gobject.
+
 2008-08-27  Tor Lillqvist  <tml@novell.com>
 
 	* win32/vs8/*.vcproj: Add "win32" directory level to the
diff --git a/build/win32/vs8/glib.vcproj b/build/win32/vs8/glib.vcproj
index 6ed7e83..e700766 100644
--- a/build/win32/vs8/glib.vcproj
+++ b/build/win32/vs8/glib.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/win32/proxy-libintl-20080418/include&quot;"
-				PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;WIN32;HAVE_CONFIG_H;GLIB_COMPILATION;GLIB_EXPORTS;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;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="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;G_DISABLE_DEPRECATED;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"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/proxy-libintl-20080418/include&quot;"
-				PreprocessorDefinitions="_WINDOWS;_USRDLL;WIN32;NDEBUG;GLIB_EXPORTS;GLIB_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;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="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_DISABLE_DEPRECATED;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"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs8/gmodule.vcproj b/build/win32/vs8/gmodule.vcproj
index 6cf893f..a6b098c 100644
--- a/build/win32/vs8/gmodule.vcproj
+++ b/build/win32/vs8/gmodule.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMODULE_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -124,7 +124,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMODULE_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs8/gobject.vcproj b/build/win32/vs8/gobject.vcproj
index fbe7181..3202cb4 100644
--- a/build/win32/vs8/gobject.vcproj
+++ b/build/win32/vs8/gobject.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_EXPORTS;GOBJECT_COMPILATION;HAVE_CONFIG_H"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -122,7 +122,7 @@
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_EXPORTS;GOBJECT_COMPILATION;HAVE_CONFIG_H"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_EXPORTS;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs8/gthread.vcproj b/build/win32/vs8/gthread.vcproj
index 376b425..9d0718a 100644
--- a/build/win32/vs8/gthread.vcproj
+++ b/build/win32/vs8/gthread.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GTHREAD_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_THREADS_ENABLED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -122,7 +122,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTHREAD_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTHREAD_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-- 
2.7.4