From c5dc47a800150c8ee3294818a48aaf0d10ff1f8e Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Tue, 20 Feb 2018 22:04:31 +0300 Subject: [PATCH 1/4] compiled libcurl.dll and nanomsg.dll is a part of package (archive with release) --- marketmaker_build_32_64.cmd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/marketmaker_build_32_64.cmd b/marketmaker_build_32_64.cmd index 730081702..faf016457 100644 --- a/marketmaker_build_32_64.cmd +++ b/marketmaker_build_32_64.cmd @@ -72,10 +72,14 @@ IF "%host%"=="VM-81" ( mkdir package_content\win64 copy /y Release\marketmaker.exe package_content\win32 copy /y x64\Release\marketmaker.exe package_content\win64 + copy /y x64\Release\libcurl.dll package_content\win64 + copy /y x64\Release\nanomsg.dll package_content\win64 echo Marketmaker_%LP_MAJOR_VERSION%.%LP_MINOR_VERSION%_%LP_BUILD_NUMBER%%GIT_COMMIT% > package_content\version.txt cd package_content "C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win32\marketmaker.exe "C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win64\marketmaker.exe + "C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win64\libcurl.dll + "C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win64\nanomsg.dll "C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z version.txt cd .. rd package_content /s /q From 38cbe3ba205f387d121bf79171a8de39ad6f66be Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 25 Feb 2018 23:58:06 +0200 Subject: [PATCH 2/4] Fix static mm --- iguana/m_mm_StaticNanoMsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/m_mm_StaticNanoMsg b/iguana/m_mm_StaticNanoMsg index 2c224b764..280a3bd70 100755 --- a/iguana/m_mm_StaticNanoMsg +++ b/iguana/m_mm_StaticNanoMsg @@ -19,7 +19,7 @@ all: +$(MAKE) -C secp256k1 -f m_unix_Makefile all +$(MAKE) -C ../crypto777 -f m_LP_StaticNanoMsg all +$(MAKE) -C ../crypto777 -f m_LP_StaticNanoMsg clean - $(CC) -o ../agents/marketmaker -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c groestl.c segwit_addr.c secp256k1.o ../agents/libcrypto777.a ../OSlibs/linux/$(shell uname -m)/libnanomsg-static.a -lcurl -lpthread -lm -lanl + $(CC) -DNOTETOMIC -o ../agents/marketmaker -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c groestl.c segwit_addr.c secp256k1.o ../agents/libcrypto777.a ../OSlibs/linux/$(shell uname -m)/libnanomsg-static.a -lcurl -lpthread -lm -lanl @echo "===========================" @echo " marketmaker -> `pwd`/../agents/marketmaker" @echo "===========================" From ea64929eecaa856021922ee867bb41f7e51b3537 Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Mon, 26 Feb 2018 04:23:37 +0300 Subject: [PATCH 3/4] added NOTETOMIC preprocessor definition to build without etomic lib for ETH/ERC20 atomic swaps --- marketmaker.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/marketmaker.vcxproj b/marketmaker.vcxproj index fbe023dc8..99c4d66cf 100644 --- a/marketmaker.vcxproj +++ b/marketmaker.vcxproj @@ -86,7 +86,7 @@ Level2 Disabled - _CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_DEBUG;_CONSOLE;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_DEBUG;_CONSOLE;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;%(PreprocessorDefinitions) 8Bytes .\iguana;%(AdditionalIncludeDirectories) @@ -103,7 +103,7 @@ Level3 Disabled - _DEBUG;_CONSOLE;NATIVE_WINDOWS;WIN32;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;NATIVE_WINDOWS;WIN32;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;%(PreprocessorDefinitions) 8Bytes @@ -121,7 +121,7 @@ MaxSpeed true true - _CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;%(PreprocessorDefinitions) 8Bytes @@ -141,7 +141,7 @@ MaxSpeed true true - WIN64;_WIN64;_CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;%(PreprocessorDefinitions) + WIN64;_WIN64;_CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;%(PreprocessorDefinitions) 8Bytes MultiThreaded From b38d2d9db9f322350f74c5236a367280925618a8 Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Mon, 26 Feb 2018 04:30:47 +0300 Subject: [PATCH 4/4] added sample script to build cpp-ethereum libs under Windows (not fully tested) --- marketmaker_build_cpp-ethereum.cmd | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 marketmaker_build_cpp-ethereum.cmd diff --git a/marketmaker_build_cpp-ethereum.cmd b/marketmaker_build_cpp-ethereum.cmd new file mode 100644 index 000000000..589d2924b --- /dev/null +++ b/marketmaker_build_cpp-ethereum.cmd @@ -0,0 +1,15 @@ +@echo off +rem Sample script to build cpp-ethereum libs by Decker (don't fully tested yet) +rem Make sure cpp-ethereum is empty, before run. + +git submodule init +git submodule update --init --recursive +cd cpp-ethereum +rem git submodule init +rem git submodule update --init +call scripts\install_deps.bat +mkdir build_win64_release +cd build_win64_release +cmake .. -G "Visual Studio 14 2015 Win64" +cmake --build . --config Release +rem cmake --build . \ No newline at end of file