projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83f04af)
Fix GIO/GObject Visual C++ projects
authorChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 2 May 2012 03:10:23 +0000 (11:10 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 2 May 2012 03:10:23 +0000 (11:10 +0800)
-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 patch | blob | history
build/win32/vs10/gobject.vcxprojin patch | blob | history
build/win32/vs9/gio.vcprojin patch | blob | history
build/win32/vs9/gobject.vcprojin patch | blob | history

diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin
index 9b83fe6..362d820 100644 (file)
--- a/build/win32/vs10/gio.vcxprojin
+++ b/build/win32/vs10/gio.vcxprojin
@@ -71,7 +71,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -97,7 +97,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -124,7 +124,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -150,7 +150,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../../gio;../../../gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>G_LOG_DOMAIN="GLib-GIO";GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR="gio/modules";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/build/win32/vs10/gobject.vcxprojin b/build/win32/vs10/gobject.vcxprojin
index b0ec950..e39b192 100644 (file)
--- a/build/win32/vs10/gobject.vcxprojin
+++ b/build/win32/vs10/gobject.vcxprojin
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -123,7 +123,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -148,7 +148,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>GOBJECT_COMPILATION;G_LOG_DOMAIN="Glib-GObject";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="Glib-GObject";FFI_BUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
index 41352e0..8d73dcd 100644 (file)
--- a/build/win32/vs9/gio.vcprojin
+++ b/build/win32/vs9/gio.vcprojin
@@ -28,7 +28,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../../gio,../../../gmodule"\r
-                               PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
+                               PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -61,7 +61,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../../../gio,../../../gmodule"\r
-                               PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
+                               PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -94,7 +94,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../../gio,../../../gmodule"\r
-                               PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
+                               PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -127,7 +127,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../../../gio,../../../gmodule"\r
-                               PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
+                               PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
diff --git a/build/win32/vs9/gobject.vcprojin b/build/win32/vs9/gobject.vcprojin
index 909c451..c9baac3 100644 (file)
--- a/build/win32/vs9/gobject.vcprojin
+++ b/build/win32/vs9/gobject.vcprojin
@@ -28,7 +28,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
+                               PreprocessorDefinitions="_DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;FFI_BUILDING"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                WholeProgramOptimization="false"
-                               PreprocessorDefinitions="GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
+                               PreprocessorDefinitions="GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;FFI_BUILDING"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -92,7 +92,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
+                               PreprocessorDefinitions="_DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;FFI_BUILDING"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -124,7 +124,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                WholeProgramOptimization="false"
-                               PreprocessorDefinitions="GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
+                               PreprocessorDefinitions="GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;FFI_BUILDING"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
Domain: System / Base;