Imported Upstream version 2.53.4

Change-Id: I17e5e677f01d881ae678eb79578dde29dd2950b3
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

10 files changed, 69 insertions, 269 deletions

diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
index fbdb0adc3..b1fbcaec6 100644
--- a/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -3,8 +3,6 @@ EXTRA_DIST = \
 	glib.sln \
 	glib.vcxproj \
 	glib.vcxproj.filters \
-	glib-genmarshal.vcxproj \
-	glib-genmarshal.vcxproj.filters \
 	gspawn-win32-helper-console.vcxproj \
 	gspawn-win32-helper-console.vcxproj.filters \
 	gspawn-win32-helper.vcxproj \
diff --git a/win32/vs11/Makefile.in b/win32/vs11/Makefile.in
index 63e4057e1..e834db1b1 100644
--- a/win32/vs11/Makefile.in
+++ b/win32/vs11/Makefile.in
@@ -399,8 +399,6 @@ EXTRA_DIST = \
 	glib.sln \
 	glib.vcxproj \
 	glib.vcxproj.filters \
-	glib-genmarshal.vcxproj \
-	glib-genmarshal.vcxproj.filters \
 	gspawn-win32-helper-console.vcxproj \
 	gspawn-win32-helper-console.vcxproj.filters \
 	gspawn-win32-helper.vcxproj \
diff --git a/win32/vs11/README.txt b/win32/vs11/README.txt
index ac9233da3..135456299 100644
--- a/win32/vs11/README.txt
+++ b/win32/vs11/README.txt
@@ -24,6 +24,11 @@ builds, and correspondingly
 http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ for 64-bit

 builds.

 

+A Python 2.7.x or 3.x interpreter is also required, in order to generate

+the utility scripts, as well as the pkg-config files for the build.  Please

+see the entry "PythonDir" in glib-version-paths.props to verify that

+it is correct.

+

 One may wish to build his/her own ZLib-It is recommended that ZLib is

 built using the win32/Makefile.msc makefile with VS11 with the ASM routines

 to avoid linking problems-see win32/Makefile.msc in ZLib for more details.

diff --git a/win32/vs11/glib-genmarshal.vcxproj b/win32/vs11/glib-genmarshal.vcxproj
deleted file mode 100644
index 4cca67c91..000000000
--- a/win32/vs11/glib-genmarshal.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BD12E835-5C52-4E5D-8234-1C579F33E27A}</ProjectGuid>
-    <RootNamespace>glibgenmarshal</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="glib-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gobject\glib-genmarshal.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="glib.vcxproj">
-      <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/glib-genmarshal.vcxproj.filters b/win32/vs11/glib-genmarshal.vcxproj.filters
deleted file mode 100644
index bcb3d4a49..000000000
--- a/win32/vs11/glib-genmarshal.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gobject\glib-genmarshal.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/glib-install.props b/win32/vs11/glib-install.props
index 5ecc7c50e..25497433a 100644
--- a/win32/vs11/glib-install.props
+++ b/win32/vs11/glib-install.props
@@ -18,8 +18,6 @@ copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).dll $(CopyDir)\bin
 copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).pdb $(CopyDir)\bin
 copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).dll $(CopyDir)\bin
 copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\glib-genmarshal.exe $(CopyDir)\bin
-copy $(BinDir)\glib-genmarshal.pdb $(CopyDir)\bin
 copy $(BinDir)\gspawn-win*-helper*.exe $(CopyDir)\bin
 copy $(BinDir)\gspawn-win*-helper*.pdb $(CopyDir)\bin
 copy $(BinDir)\glib-compile-schemas.exe $(CopyDir)\bin
@@ -36,8 +34,9 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin
 copy $(BinDir)\gdbus.pdb $(CopyDir)\bin
 copy $(BinDir)\gio.exe $(CopyDir)\bin
 copy $(BinDir)\gio.pdb $(CopyDir)\bin
-if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin
-if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin
+copy ..\..\gobject\glib-mkenums $(CopyDir)\bin
+copy ..\..\gobject\glib-genmarshal $(CopyDir)\bin
+copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin
 mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
 copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
 copy ..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
@@ -317,11 +316,12 @@ copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
 mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen
 copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
 </GlibDoInstall>
-    <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts>
+    <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gobject\glib-genmarshal;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts>
     <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles>
-    <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums>
-    <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen>
-    <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC>
+    <GenGLibMKEnums>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums>
+    <GenGLibGenmarshal>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal --version=$(GlibVersion)</GenGLibGenmarshal>
+    <GenGDBusCodegen>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen>
+    <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; ($(PythonDir)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>glibinstallprops</_PropertySheetDisplayName>
@@ -342,6 +342,9 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege
     <BuildMacro Include="GenGLibMKEnums">
       <Value>$(GenGLibMKEnums)</Value>
     </BuildMacro>
+    <BuildMacro Include="GenGLibGenmarshal">
+      <Value>$(GenGLibGenmarshal)</Value>
+    </BuildMacro>
     <BuildMacro Include="GenGDBusCodegen">
       <Value>$(GenGDBusCodegen)</Value>
     </BuildMacro>
diff --git a/win32/vs11/glib-install.vcxproj b/win32/vs11/glib-install.vcxproj
index 5f42f4ac0..81089e421 100644
--- a/win32/vs11/glib-install.vcxproj
+++ b/win32/vs11/glib-install.vcxproj
@@ -97,6 +97,14 @@
       <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command>
       <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\gobject\glib-genmarshal.in">
+      <Message Condition="'$(Configuration)'=='Debug'">Generating glib-genmarshal...</Message>
+      <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibGenmarshal)</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-genmarshal;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Generating glib-genmarshal...</Message>
+      <Command Condition="'$(Configuration)'=='Release'">$(GenGLibGenmarshal)</Command>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-genmarshal;%(Outputs)</Outputs>
+    </CustomBuild>
     <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in">
       <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command>
@@ -121,10 +129,6 @@
       <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="glib-genmarshal.vcxproj">
-      <Project>{bd12e835-5c52-4e5d-8234-1c579f33e27a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="glib.vcxproj">
       <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/win32/vs11/glib-install.vcxproj.filters b/win32/vs11/glib-install.vcxproj.filters
index 6748dcf8f..aae121554 100644
--- a/win32/vs11/glib-install.vcxproj.filters
+++ b/win32/vs11/glib-install.vcxproj.filters
@@ -8,6 +8,7 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\gobject\glib-genmarshal.in"><Filter>Resource Files</Filter></CustomBuild>
     <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource Files</Filter></CustomBuild>
     <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild>
     <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild>
diff --git a/win32/vs11/glib-version-paths.props b/win32/vs11/glib-version-paths.props
index c95365dfd..67354652d 100644
--- a/win32/vs11/glib-version-paths.props
+++ b/win32/vs11/glib-version-paths.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <VSVer>11</VSVer>
-    <GlibVersion>2.53.3</GlibVersion>
+    <GlibVersion>2.53.4</GlibVersion>
     <ApiVersion>2.0</ApiVersion>
     <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
@@ -12,7 +12,11 @@
     <GlibSeparateVSDllSuffix>-2-vs$(VSVer)</GlibSeparateVSDllSuffix>
     <GlibDllPrefix>$(GlibSeparateVSDllPrefix)</GlibDllPrefix>
     <GlibDllSuffix>$(GlibSeparateVSDllSuffix)</GlibDllSuffix>
-    <PythonPath>c:\python27</PythonPath>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\python36</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\python36</PythonDir>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>glibversionpathsprops</_PropertySheetDisplayName>
@@ -51,8 +55,8 @@
     <BuildMacro Include="GlibDllSuffix">
       <Value>$(GlibDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
+    <BuildMacro Include="PythonDir">
+      <Value>$(PythonDir)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs11/glib.sln b/win32/vs11/glib.sln
index 1e5f84b0e..d6a3b3266 100644
--- a/win32/vs11/glib.sln
+++ b/win32/vs11/glib.sln
@@ -8,8 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gobject", "gobject.vcxproj"
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gthread", "gthread.vcxproj", "{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-genmarshal", "glib-genmarshal.vcxproj", "{BD12E835-5C52-4E5D-8234-1C579F33E27A}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio", "gio.vcxproj", "{F3D1583C-5613-4809-BD98-7CC1C1276F92}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gspawn-win32-helper", "gspawn-win32-helper.vcxproj", "{289240E7-E167-47CE-A20C-58D852E520BA}"

@@ -28,10 +26,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-querymodules", "gio-que
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280687}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcxproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcxproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -108,22 +106,6 @@ Global
 		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

 		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

 		{C8AFB8C3-FFFD-460F-BC13-9AC25D7B117C}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|Win32.Build.0 = Debug|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|x64.ActiveCfg = Debug|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug|x64.Build.0 = Debug|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.ActiveCfg = Release|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|Win32.Build.0 = Release|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|x64.ActiveCfg = Release|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release|x64.Build.0 = Release|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

-		{BD12E835-5C52-4E5D-8234-1C579F33E27A}.Release_BundledPCRE|x64.Build.0 = Release|x64

 		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|Win32.Build.0 = Debug|Win32

 		{F3D1583C-5613-4809-BD98-7CC1C1276F92}.Debug|x64.ActiveCfg = Debug|x64

@@ -268,38 +250,38 @@ Global
 		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

 		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

 		{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64

-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64
-		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64
+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64

+		{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.Build.0 = Release|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.Build.0 = Debug|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64

+		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE