projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4476e22)
Update gsettings/glib-compile-schemas VS Projects
authorChun-wei Fan <fanchunwei@src.gnome.org>
Sat, 18 Jun 2011 09:55:58 +0000 (17:55 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Sat, 18 Jun 2011 09:55:58 +0000 (17:55 +0800)
These tools require the use of GModule headers also, so update the include
directories so that the correct gmodule.h will be included instead of the
system-installed version.

build/win32/vs10/glib-compile-schemas.vcxproj patch | blob | history
build/win32/vs10/gsettings.vcxproj patch | blob | history
build/win32/vs9/glib-compile-schemas.vcproj patch | blob | history
build/win32/vs9/gsettings.vcproj patch | blob | history

diff --git a/build/win32/vs10/glib-compile-schemas.vcxproj b/build/win32/vs10/glib-compile-schemas.vcxproj
index d6ee460..c4bd416 100644 (file)
--- a/build/win32/vs10/glib-compile-schemas.vcxproj
+++ b/build/win32/vs10/glib-compile-schemas.vcxproj
@@ -72,6 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -90,6 +91,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,6 +115,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -131,6 +134,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
diff --git a/build/win32/vs10/gsettings.vcxproj b/build/win32/vs10/gsettings.vcxproj
index 90ebd21..a8b74c6 100644 (file)
--- a/build/win32/vs10/gsettings.vcxproj
+++ b/build/win32/vs10/gsettings.vcxproj
@@ -72,6 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -90,6 +91,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,6 +115,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -132,6 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
diff --git a/build/win32/vs9/glib-compile-schemas.vcproj b/build/win32/vs9/glib-compile-schemas.vcproj
index 014787f..817cbe5 100644 (file)
--- a/build/win32/vs9/glib-compile-schemas.vcproj
+++ b/build/win32/vs9/glib-compile-schemas.vcproj
@@ -31,6 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -56,6 +57,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -88,6 +90,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                EnableIntrinsicFunctions="true"
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                RuntimeLibrary="2"
@@ -115,6 +118,7 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
diff --git a/build/win32/vs9/gsettings.vcproj b/build/win32/vs9/gsettings.vcproj
index 25b8815..247956e 100644 (file)
--- a/build/win32/vs9/gsettings.vcproj
+++ b/build/win32/vs9/gsettings.vcproj
@@ -31,6 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="_DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -56,6 +57,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="DEBUG;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -89,6 +91,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
@@ -116,6 +119,7 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
Domain: System / Base;