diff --git a/scripts/windows_setup.sh b/scripts/windows_setup.sh index afe77ccf26..0bec445736 100644 --- a/scripts/windows_setup.sh +++ b/scripts/windows_setup.sh @@ -32,7 +32,7 @@ build_component() { local dir="$1" local command="$2" local name="$3" - + echo "Building $name" if [ -d "$dir" ]; then change_directory "$dir" @@ -61,14 +61,19 @@ cd ../../../.. echo "5. Building miniupnpc" build_component "vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc" "./mingw32make.bat" "miniupnpc" - echo "6. Building libnatpmp" -build_component "vendor/nim-nat-traversal/vendor/libnatpmp-upstream" "./build.bat" "libnatpmp" +cd ./vendor/nim-nat-traversal/vendor/libnatpmp-upstream +./build.bat +mv natpmp.a libnatpmp.a +cd ../../../../ -# echo "7. Building libunwind" -# build_component "vendor/nim-libbacktrace" "make install/usr/lib/libunwind.a" "libunwind" +echo "7. Building libunwind" +cd vendor/nim-libbacktrace +make all +make install/usr/lib/libunwind.a +cd ../../ echo "8. Building wakunode2" -execute_command "make wakunode2 V=1 NIMFLAGS="-d:disableMarchNative -d:postgres -d:chronicles_colors:none" " +make wakunode2 V=1 echo "Windows setup completed successfully!" diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl index 667b40440a..953a795b96 160000 --- a/vendor/nim-bearssl +++ b/vendor/nim-bearssl @@ -1 +1 @@ -Subproject commit 667b40440a53a58e9f922e29e20818720c62d9ac +Subproject commit 953a795b96d73a7401e7a1041587da9ffe6d78f6 diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles index 4524912fca..81a4a7a360 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit 4524912fcacfd3965e32a9fe23c9bb12d48177ff +Subproject commit 81a4a7a360c78be9c80c8f735c76b6d4a1517304 diff --git a/vendor/nim-chronos b/vendor/nim-chronos index c04576d829..03f4328de6 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit c04576d829b8a0a1b12baaa8bc92037501b3a4a0 +Subproject commit 03f4328de6135a06830103fdfd1d0aeb9bc8a1c8 diff --git a/vendor/nim-confutils b/vendor/nim-confutils index cb640db2cd..cb858a27f4 160000 --- a/vendor/nim-confutils +++ b/vendor/nim-confutils @@ -1 +1 @@ -Subproject commit cb640db2cd66d7f4a1810a7df51b55f6f59cf3c5 +Subproject commit cb858a27f4347be949d10ed74b58713d687936d2 diff --git a/vendor/nim-eth b/vendor/nim-eth index bb5cb6a4d0..c2d47ac20e 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit bb5cb6a4d0dbb592b395ab41cda3fd3f1fdc443e +Subproject commit c2d47ac20eb7a445a3198de58798571ea8b4940f diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams index dbc4a95df6..cf8d4d2263 160000 --- a/vendor/nim-faststreams +++ b/vendor/nim-faststreams @@ -1 +1 @@ -Subproject commit dbc4a95df60238157dcf286f6125188cb72f37c1 +Subproject commit cf8d4d22636b8e514caf17e49f9c786ac56b0e85 diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils index 8b88ad6dd9..8bb1acbaa4 160000 --- a/vendor/nim-http-utils +++ b/vendor/nim-http-utils @@ -1 +1 @@ -Subproject commit 8b88ad6dd9a6326c29f82067800c483d9410d873 +Subproject commit 8bb1acbaa4b86eb866145b0d468eff64a57d1897 diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc index 33360528d2..08a751bba5 160000 --- a/vendor/nim-json-rpc +++ b/vendor/nim-json-rpc @@ -1 +1 @@ -Subproject commit 33360528d208aaa70a6ed914619fe76321760d54 +Subproject commit 08a751bba51c234d5b3a81bada1901cdd1964d8f diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization index 8a4ed98bbd..cb54306f71 160000 --- a/vendor/nim-json-serialization +++ b/vendor/nim-json-serialization @@ -1 +1 @@ -Subproject commit 8a4ed98bbd0a9479df15af2fa31da38a586ea6d5 +Subproject commit cb54306f712655116df073ad7194c45aa515a6ab diff --git a/vendor/nim-libbacktrace b/vendor/nim-libbacktrace index b6e26f03c0..6da0cda88a 160000 --- a/vendor/nim-libbacktrace +++ b/vendor/nim-libbacktrace @@ -1 +1 @@ -Subproject commit b6e26f03c091a8e3bba6adc06198fc3055bacc66 +Subproject commit 6da0cda88ab7780bd5fd342327adb91ab84692aa diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p index 8855bce085..1fa30f07e8 160000 --- a/vendor/nim-libp2p +++ b/vendor/nim-libp2p @@ -1 +1 @@ -Subproject commit 8855bce0854ecf4adad7a0556bb2b2d2f98e0e20 +Subproject commit 1fa30f07e81e9ef415a83c5d3846e86e99a7857f diff --git a/vendor/nim-metrics b/vendor/nim-metrics index 29bb7ba63c..cacfdc1245 160000 --- a/vendor/nim-metrics +++ b/vendor/nim-metrics @@ -1 +1 @@ -Subproject commit 29bb7ba63cd884770169891687595348a70cf166 +Subproject commit cacfdc12454a0804c65112b9f4f50d1375208dcd