From 4d1756d01f86c1d1c2d859506f714dea1f1e789d Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 18 May 2021 18:52:23 +0200
Subject: [PATCH] ROOT [Windows]

---
 products/compil_scripts/root-6.24.bat      |  1 +
 products/patches/python-3.6.5-VS2019.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 products/patches/python-3.6.5-VS2019.patch

diff --git a/products/compil_scripts/root-6.24.bat b/products/compil_scripts/root-6.24.bat
index 5d75e9e..0e89f39 100644
--- a/products/compil_scripts/root-6.24.bat
+++ b/products/compil_scripts/root-6.24.bat
@@ -52,6 +52,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SYSTEM_VERSION=10.0.19041.0
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
+set PATH=%BUILD_DIR%\bin;%PATH%
 
 echo.
 echo --------------------------------------------------------------------------
diff --git a/products/patches/python-3.6.5-VS2019.patch b/products/patches/python-3.6.5-VS2019.patch
new file mode 100644
index 0000000..2a6ed17
--- /dev/null
+++ b/products/patches/python-3.6.5-VS2019.patch
@@ -0,0 +1,12 @@
+diff -Naur Python_ref/PCbuild/_distutils_findvs.vcxproj Python_new/PCbuild/_distutils_findvs.vcxproj
+--- Python_ref/PCbuild/_distutils_findvs.vcxproj	2018-03-28 11:19:31.000000000 +0200
++++ Python_new/PCbuild/_distutils_findvs.vcxproj	2021-05-18 18:47:18.610913526 +0200
+@@ -61,7 +61,7 @@
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+     <Link>
+-      <AdditionalDependencies>version.lib;ole32.lib;oleaut32.lib;Microsoft.VisualStudio.Setup.Configuration.Native.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>version.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
-- 
2.39.2