[glib] MSVC Builds: Fix gio-tool projects



commit fc0567780b7bb8a790df2cea132e8b58c8a6a8d7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Sep 20 15:06:35 2016 +0800

    MSVC Builds: Fix gio-tool projects
    
    We need to look in $(srcroot)\gmodule for the up-to-date gmodule.h.
    
    Pointed out by Ignacio Casal Quinteiro.

 build/win32/vs10/gio-tool.vcxprojin |    8 ++++----
 build/win32/vs9/gio-tool.vcprojin   |    6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/build/win32/vs10/gio-tool.vcxprojin b/build/win32/vs10/gio-tool.vcxprojin
index 252e29d..4d7cf39 100644
--- a/build/win32/vs10/gio-tool.vcxprojin
+++ b/build/win32/vs10/gio-tool.vcxprojin
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<AdditionalIncludeDirectories>..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -96,7 +96,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<AdditionalIncludeDirectories>..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -122,7 +122,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      
<AdditionalIncludeDirectories>..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -143,7 +143,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      
<AdditionalIncludeDirectories>..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>..\..\..\gio;..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
diff --git a/build/win32/vs9/gio-tool.vcprojin b/build/win32/vs9/gio-tool.vcprojin
index 87f1bf2..ffa91b2 100644
--- a/build/win32/vs9/gio-tool.vcprojin
+++ b/build/win32/vs9/gio-tool.vcprojin
@@ -31,6 +31,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
                                PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -58,7 +59,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=""
+                               AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
                                PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -93,6 +94,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="2"
+                               AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
                                EnableIntrinsicFunctions="true"
                                PreprocessorDefinitions="$(GioInBuildMacro)"
                                RuntimeLibrary="2"
@@ -122,8 +124,8 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\gmodule"
                                PreprocessorDefinitions="$(GioInBuildMacro)"
+                               AdditionalIncludeDirectories="..\..\..\gio;..\..\..\gmodule"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]