From 4957fff5840d4de100b5996ab7da0f2580573c93 Mon Sep 17 00:00:00 2001 From: Mat Mariani Date: Mon, 21 May 2018 01:25:38 -0400 Subject: [PATCH 1/3] Fixed PreBuildEvents on vs2017 --- util/vs2017/wren/wren.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/vs2017/wren/wren.vcxproj b/util/vs2017/wren/wren.vcxproj index e8bd3d79..faa20ae8 100644 --- a/util/vs2017/wren/wren.vcxproj +++ b/util/vs2017/wren/wren.vcxproj @@ -111,8 +111,8 @@ mainCRTStartup - python ../../libuv.py download -python ../../libuv.py build -32 + python ../../update_deps.py +python ../../build_libuv.py -32 From 85b2c9a99da3522f153d3ee10bd822e2339e0f54 Mon Sep 17 00:00:00 2001 From: Mat Mariani Date: Mon, 21 May 2018 01:57:50 -0400 Subject: [PATCH 2/3] added explicity vs2017 argument To build with VS2017 you need to explicitly add a vs2017 argument --- util/build_libuv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/build_libuv.py b/util/build_libuv.py index 9c081bf9..b6152f71 100755 --- a/util/build_libuv.py +++ b/util/build_libuv.py @@ -47,7 +47,7 @@ def build_libuv_linux(arch): def build_libuv_windows(arch): - args = ["cmd", "/c", "vcbuild.bat", "release"] + args = ["cmd", "/c", "vcbuild.bat", "release", "vs2017"] if arch == "-32": args.append("x86") elif arch == "-64": From 9934d170197e0a980bc9cdde0fc7c226121d513a Mon Sep 17 00:00:00 2001 From: Mat Mariani Date: Mon, 21 May 2018 11:14:23 -0400 Subject: [PATCH 3/3] Update PreBuildEvent scripts for more conditions --- util/vs2017/wren/wren.vcxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/util/vs2017/wren/wren.vcxproj b/util/vs2017/wren/wren.vcxproj index faa20ae8..6c6cf713 100644 --- a/util/vs2017/wren/wren.vcxproj +++ b/util/vs2017/wren/wren.vcxproj @@ -133,8 +133,8 @@ python ../../build_libuv.py -32 mainCRTStartup - python ../../libuv.py download -python ../../libuv.py build -64 + python ../../update_deps.py +python ../../build_libuv.py -64 @@ -159,8 +159,8 @@ python ../../libuv.py build -64 mainCRTStartup - python ../../libuv.py download -python ../../libuv.py build -32 + python ../../update_deps.py +python ../../build_libuv.py -32 @@ -185,8 +185,8 @@ python ../../libuv.py build -32 mainCRTStartup - python ../../libuv.py download -python ../../libuv.py build -64 + python ../../update_deps.py +python ../../build_libuv.py -64