projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a300ea)
Update to match the Makefile.am files. Drop G*_EXPORTS from
authorTor Lillqvist <tml@novell.com>
Mon, 15 Sep 2008 14:04:51 +0000 (14:04 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Mon, 15 Sep 2008 14:04:51 +0000 (14:04 +0000)
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 patch | blob | history
build/win32/vs8/glib.vcproj patch | blob | history
build/win32/vs8/gmodule.vcproj patch | blob | history
build/win32/vs8/gobject.vcproj patch | blob | history
build/win32/vs8/gthread.vcproj patch | blob | history

diff --git a/build/ChangeLog b/build/ChangeLog
index 1ba8ae2..2732bbc 100644 (file)
--- 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 (file)
--- a/build/win32/vs8/glib.vcproj
+++ b/build/win32/vs8/glib.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/win32/proxy-libintl-20080418/include&quot;"\r
-                               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"\r
+                               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"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -126,7 +126,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/proxy-libintl-20080418/include&quot;"\r
-                               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"\r
+                               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"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
diff --git a/build/win32/vs8/gmodule.vcproj b/build/win32/vs8/gmodule.vcproj
index 6cf893f..a6b098c 100644 (file)
--- a/build/win32/vs8/gmodule.vcproj
+++ b/build/win32/vs8/gmodule.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../../glib;../../.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMODULE_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -124,7 +124,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../../../glib;../../.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMODULE_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
diff --git a/build/win32/vs8/gobject.vcproj b/build/win32/vs8/gobject.vcproj
index fbe7181..3202cb4 100644 (file)
--- 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 (file)
--- a/build/win32/vs8/gthread.vcproj
+++ b/build/win32/vs8/gthread.vcproj
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../..,../../../glib"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GTHREAD_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_THREADS_ENABLED"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -122,7 +122,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../../..,../../../glib"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTHREAD_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTHREAD_EXPORTS;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
Domain: System / Base;