From 874355de53e7ea7009860c0b67094d919a5daa6f Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 2 May 2012 11:10:23 +0800 Subject: [PATCH] Fix GIO/GObject Visual C++ projects -Make up for the missed DLL_EXPORT-it's actually needed for all GLib DLL builds, omitting this caused problems to surface due to recent works to make GDBus work on Windows. -Also use the FFI_BULIDING macro for GObject builds as the suggessted workaround for using static LibFFI builds (as we do now)-please see ffi.h(.in). This will fix the build of GObject against LibFFI 3.0.11, but it is probable that this will change at some point for LibFFI. --- build/win32/vs10/gio.vcxprojin | 8 ++++---- build/win32/vs10/gobject.vcxprojin | 8 ++++---- build/win32/vs9/gio.vcprojin | 8 ++++---- build/win32/vs9/gobject.vcprojin | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin index 9b83fe68c..362d82080 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/build/win32/vs10/gio.vcxprojin @@ -71,7 +71,7 @@ Disabled ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - _DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -97,7 +97,7 @@ ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) MultiThreadedDLL @@ -124,7 +124,7 @@ Disabled ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - _DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + _DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -150,7 +150,7 @@ ../../../gio;../../../gmodule;%(AdditionalIncludeDirectories) - G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) + G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gobject.vcxprojin b/build/win32/vs10/gobject.vcxprojin index b0ec950e4..e39b192df 100644 --- a/build/win32/vs10/gobject.vcxprojin +++ b/build/win32/vs10/gobject.vcxprojin @@ -71,7 +71,7 @@ Disabled - _DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + _DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -96,7 +96,7 @@ false - GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions) MultiThreadedDLL @@ -123,7 +123,7 @@ Disabled - _DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + _DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -148,7 +148,7 @@ false - GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions) + GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin index 41352e068..8d73dcdef 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="_DEBUG;G_LOG_DOMAIN=\"GLib-GIO\";GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\"" + PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\"GLib-GIO\";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR=\"gio/modules\"" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -61,7 +61,7 @@