From 21d80b55ccabd21f4f4e0a5a3836e76ff367678d Mon Sep 17 00:00:00 2001 From: Enrico Bertolazzi Date: Tue, 26 Oct 2021 01:36:46 +0200 Subject: [PATCH] use NMake to compile on windows --- Rakefile | 3 ++- submodules/GenericContainer | 2 +- submodules/Utils | 2 +- submodules/quarticRootsFlocke | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index c3bb2c6d..40d33199 100755 --- a/Rakefile +++ b/Rakefile @@ -81,7 +81,8 @@ task :build_win, [:year, :bits] do |t, args| FileUtils.mkdir_p dir FileUtils.cd dir - cmd_cmake = win_vs(args.bits,args.year) + cmd_cmake_build + #cmd_cmake = win_vs(args.bits,args.year) + cmd_cmake_build + cmd_cmake = 'cmake -G "NMake Makefiles" ' + cmd_cmake_build puts "run CMAKE for CLOTHOIDS".yellow sh cmd_cmake + ' ..' diff --git a/submodules/GenericContainer b/submodules/GenericContainer index 0f433555..4db2a925 160000 --- a/submodules/GenericContainer +++ b/submodules/GenericContainer @@ -1 +1 @@ -Subproject commit 0f4335550663b9999d5e457f9ca3d9d640da0022 +Subproject commit 4db2a9252905181bb4c8e7647af73d25267f4dfe diff --git a/submodules/Utils b/submodules/Utils index b7171734..7fb1b4ab 160000 --- a/submodules/Utils +++ b/submodules/Utils @@ -1 +1 @@ -Subproject commit b7171734ef70caf129e0246738ac40e1d93d74d8 +Subproject commit 7fb1b4ab781c7421645684132ecfce64826b2e02 diff --git a/submodules/quarticRootsFlocke b/submodules/quarticRootsFlocke index c936bcea..169ad6f8 160000 --- a/submodules/quarticRootsFlocke +++ b/submodules/quarticRootsFlocke @@ -1 +1 @@ -Subproject commit c936bcead3a3a7ff0c2de951ce23c3b7e88a4283 +Subproject commit 169ad6f8245e1102d51ceac53c0a3b22bb01e78c