From c20c1b548b13bb1561713ff6b48e2edf6e7e454c Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 16 Mar 2018 17:29:35 +0800
Subject: [PATCH] Fix Visual Studio projects

We are transitioning to Meson for Visual Studio builds, but since the
Visual Studio projects are still around, we ought to keep them
up-to-date (and these projects are needed to build for Visual Studio
2008, at least for x64 builds).

Adapt to the source additions and merges for building
gio-querymodules.exe and gspawn-win[32|64]-helper-console.exe.
---
 win32/vs10/gio-querymodules.vcxproj                    |  1 +
 win32/vs10/gio-querymodules.vcxproj.filters            |  3 +++
 win32/vs10/gspawn-win32-helper-console.vcxproj         | 10 +++++-----
 win32/vs10/gspawn-win32-helper-console.vcxproj.filters |  2 +-
 win32/vs9/gio-querymodules.vcproj                      |  1 +
 win32/vs9/gspawn-win32-helper-console.vcproj           | 10 +++++-----
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/win32/vs10/gio-querymodules.vcxproj b/win32/vs10/gio-querymodules.vcxproj
index 2b7e62fdf..2a6551fd6 100644
--- a/win32/vs10/gio-querymodules.vcxproj
+++ b/win32/vs10/gio-querymodules.vcxproj
@@ -157,6 +157,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\gio\gio-querymodules.c" />
+    <ClCompile Include="..\..\gio\giomodule-priv.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gio.vcxproj">
diff --git a/win32/vs10/gio-querymodules.vcxproj.filters b/win32/vs10/gio-querymodules.vcxproj.filters
index c39abf59a..7119db1b2 100644
--- a/win32/vs10/gio-querymodules.vcxproj.filters
+++ b/win32/vs10/gio-querymodules.vcxproj.filters
@@ -10,5 +10,8 @@
     <ClCompile Include="..\..\gio\gio-querymodules.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gio\giomodule-priv.c" >
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gspawn-win32-helper-console.vcxproj b/win32/vs10/gspawn-win32-helper-console.vcxproj
index f83bac146..6b31acf83 100644
--- a/win32/vs10/gspawn-win32-helper-console.vcxproj
+++ b/win32/vs10/gspawn-win32-helper-console.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -116,7 +116,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -138,7 +138,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(GLibInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(GLibInBuildMacro);HELPER_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -159,7 +159,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\glib\gspawn-win32-helper-console.c" />
+    <ClCompile Include="..\..\glib\gspawn-win32-helper.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="glib.vcxproj">
diff --git a/win32/vs10/gspawn-win32-helper-console.vcxproj.filters b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
index 5b43689a1..85fd3f6f3 100644
--- a/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
+++ b/win32/vs10/gspawn-win32-helper-console.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\glib\gspawn-win32-helper-console.c">
+    <ClCompile Include="..\..\glib\gspawn-win32-helper.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/win32/vs9/gio-querymodules.vcproj b/win32/vs9/gio-querymodules.vcproj
index 96b41bdc7..d9cc29731 100644
--- a/win32/vs9/gio-querymodules.vcproj
+++ b/win32/vs9/gio-querymodules.vcproj
@@ -146,6 +146,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File RelativePath="..\..\gio\gio-querymodules.c" />
+			<File RelativePath="..\..\gio\giomodule-priv.c" />
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/win32/vs9/gspawn-win32-helper-console.vcproj b/win32/vs9/gspawn-win32-helper-console.vcproj
index 6e5ef9d93..6f14391ff 100644
--- a/win32/vs9/gspawn-win32-helper-console.vcproj
+++ b/win32/vs9/gspawn-win32-helper-console.vcproj
@@ -28,7 +28,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
+				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -55,7 +55,7 @@
 			>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibInBuildMacro)"
+				PreprocessorDefinitions="$(GLibInBuildMacro);HELPER_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -82,7 +82,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
+				PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro);HELPER_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -110,7 +110,7 @@
 			>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GLibInBuildMacro)"
+				PreprocessorDefinitions="$(GLibInBuildMacro);HELPER_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -139,7 +139,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\glib\gspawn-win32-helper-console.c"
+				RelativePath="..\..\glib\gspawn-win32-helper.c"
 				>
 			</File>
 		</Filter>