diff --git a/OSlibs/win/libpthreadGC2.a b/OSlibs/win/libpthreadGC2.a index df211759f..ff267089b 100755 Binary files a/OSlibs/win/libpthreadGC2.a and b/OSlibs/win/libpthreadGC2.a differ diff --git a/OSlibs/win/x64/libpthreadGC2.a b/OSlibs/win/x64/libpthreadGC2.a new file mode 100644 index 000000000..96f31306b Binary files /dev/null and b/OSlibs/win/x64/libpthreadGC2.a differ diff --git a/crypto777/make_win32 b/crypto777/make_win32 index 8cf05518c..0ff09b83e 100644 --- a/crypto777/make_win32 +++ b/crypto777/make_win32 @@ -4,11 +4,10 @@ include ../mingw.path all: clean copy build copy : mkdir -p ../agents/win32 || true - cp -f ../OSlibs/win/pthreadGC2.dll ../agents/win32/pthreadGC2.dll build : @echo "\nBuilding crypto777....." - $(TOOL_DIR)/bin/$(MINGW) -w -D __MINGW -DHAVE_STRUCT_TIMESPEC -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I../includes/openssl -I../crypto777 || (echo -e "\033[4mERROR: Compilation failed for win32 \033[0m"; exit 1; ) + $(TOOL_DIR)/bin/$(MINGW) -w -D__CLEANUP_C -DPTW32_STATIC_LIB -D __MINGW -DHAVE_STRUCT_TIMESPEC -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I../includes/openssl -I../crypto777 -I../OSlibs/win -L../OSlibs/win -lpthreadGC2 || (echo -e "\033[4mERROR: Compilation failed for win32 \033[0m"; exit 1; ) $(TOOL_DIR)/bin/$(MINGW)-ar rcu ../agents/win32/libcrypto777.a *.o || (echo -e "\033[4mERROR: Failed to create libcrypto777.a\033[0m"; exit 1; ) @echo "\Build Successful......" diff --git a/crypto777/make_win64 b/crypto777/make_win64 index 67b508399..73e83c31b 100644 --- a/crypto777/make_win64 +++ b/crypto777/make_win64 @@ -6,7 +6,7 @@ all: clean build build: mkdir -p ../agents/win64 || true @echo "\nBuilding crypto777......" - $(TOOL_DIR)/bin/$(MINGW) -w -D __MINGW -DHAVE_STRUCT_TIMESPEC -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I../includes/openssl || (echo "\033[4m ERROR: Compilation failed for win64\033[0m"; exit 1; ) + $(TOOL_DIR)/bin/$(MINGW) -w -D__CLEANUP_C -DPTW32_STATIC_LIB -D __MINGW -DHAVE_STRUCT_TIMESPEC -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I../includes/openssl -I../OSlibs/win -L../OSlibs/win/x64 -lpthreadGC2 || (echo "\033[4m ERROR: Compilation failed for win64\033[0m"; exit 1; ) $(TOOL_DIR)/bin/$(MINGW)-ar rcu ../agents/win64/libcrypto777.a *.o || (echo "\033[4mERROR: Failed to create libcrypto777.a\033[0m"; exit 1; ) @echo "\Build Successful......" diff --git a/iguana/m_ios b/iguana/m_ios index 76c592102..ccce1734a 100755 --- a/iguana/m_ios +++ b/iguana/m_ios @@ -6,4 +6,4 @@ git pull echo CC=$CC -$CC -v -o ../agents/iguana -O2 *.c ../OSlibs/ios/lib/libssl.a ../OSlibs/ios/lib/libcrypto.a ../agents/libcrypto777.a -L $(xcrun --sdk iphonesimulator --show-sdk-path)/usr/lib -L ../OSlibs/ios/lib -lcurl -lm +$CC -v -o ../agents/iguana -O2 *.c ../ios/lib/libssl.a ../ios/lib/libcrypto.a ../agents/libcrypto777.a -L $(xcrun --sdk iphonesimulator --show-sdk-path)/usr/lib -L ../ios/lib -lcurl -lm diff --git a/iguana/make_win32 b/iguana/make_win32 index 7baac14da..83bd33783 100644 --- a/iguana/make_win32 +++ b/iguana/make_win32 @@ -6,7 +6,7 @@ all: clean check build build: @echo "\nBuilding iguana......" - $(TOOL_DIR)/bin/$(MINGW) -w -o ../agents/win32/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) || (echo -e "\033[4mERROR: Failed to build iguana\033[0m"; exit 1; ) + $(TOOL_DIR)/bin/$(MINGW) -w -D__CLEANUP_C -DPTW32_STATIC_LIB -o ../agents/win32/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) || (echo -e "\033[4mERROR: Failed to build iguana\033[0m"; exit 1; ) $(TOOL_DIR)/bin/strip --strip-all ../agents/win32/iguana.exe diff --git a/iguana/make_win64 b/iguana/make_win64 index 568c35161..fefdc912b 100644 --- a/iguana/make_win64 +++ b/iguana/make_win64 @@ -1,14 +1,14 @@ include iguana.sources include ../mingw.path64 -LIBS := ../OSlibs/win/libsecp256k1.a ../OSlibs/win/libcrypto.a ../OSlibs/win/libssl.a ../agents/win64/libcrypto777.a ../OSlibs/win/libcurldll.a $(TOOL_DIR)/x86_64-w64-mingw32/lib/libws2_32.a $(TOOL_DIR)/x86_64-w64-mingw32/lib/libgdi32.a -I$(TOOL_DIR)/include -I../iguana -I../includes -I../crypto777 -lws2_32 -lpthread +LIBS := ../OSlibs/win/libsecp256k1.a ../OSlibs/win/libcrypto.a ../OSlibs/win/libssl.a ../agents/win64/libcrypto777.a ../OSlibs/win/libcurldll.a $(TOOL_DIR)/x86_64-w64-mingw32/lib/libws2_32.a $(TOOL_DIR)/x86_64-w64-mingw32/lib/libgdi32.a -I$(TOOL_DIR)/include -I../iguana -I../includes -I../crypto777 -I../OSlibs/win -I../OSlibs/win -L../OSlibs/win/x64 -lpthreadGC2 include mingw64_inc all: check build build: - $(TOOL_DIR)/bin/$(MINGW) -w -o ../agents/win64/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) || (echo -e "\033[4mERROR: Failed to build iguana\033[0m"; exit 1; ) + $(TOOL_DIR)/bin/$(MINGW) -w -D__CLEANUP_C -DPTW32_STATIC_LIB -o ../agents/win64/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) || (echo -e "\033[4mERROR: Failed to build iguana\033[0m"; exit 1; ) $(TOOL_DIR)/bin/strip --strip-all ../agents/win64/iguana.exe || (echo -e "\033[4mERROR: Failed to strip iguana\033[0m"; exit 1; ) @echo "\Build Successful......" diff --git a/iguana/mingw b/iguana/mingw index 917339108..01f2624fe 100755 --- a/iguana/mingw +++ b/iguana/mingw @@ -1,5 +1,5 @@ include iguana.sources all: - $(TOOL_DIR)/bin/$(MINGW) -w -o ../agents/win32/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) + $(TOOL_DIR)/bin/$(MINGW) -w -D__CLEANUP_C -DPTW32_STATIC_LIB -o ../agents/win32/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) $(TOOL_DIR)/bin/strip --strip-all ../agents/win32/iguana.exe diff --git a/iguana/mingw32 b/iguana/mingw32 index 38d446990..279159960 100755 --- a/iguana/mingw32 +++ b/iguana/mingw32 @@ -1,4 +1,4 @@ include ../mingw.path -LIBS := ../agents/win32/libcrypto777.a $(TOOL_DIR)/lib/libws2_32.a -L../OSlibs/win/ $(TOOL_DIR)/lib/libgdi32.a -I$(TOOL_DIR)/include -I../iguana -I../includes -I../crypto777 -lws2_32 -lpthreadGC2 +LIBS := ../agents/win32/libcrypto777.a $(TOOL_DIR)/lib/libws2_32.a $(TOOL_DIR)/lib/libgdi32.a -I$(TOOL_DIR)/include -I../iguana -I../includes -I../crypto777 -I../OSlibs/win -L../OSlibs/win -lpthreadGC2 include mingw diff --git a/iguana/mingw64 b/iguana/mingw64 index 05d60af3e..856d6acc5 100755 --- a/iguana/mingw64 +++ b/iguana/mingw64 @@ -1,3 +1,3 @@ include ../mingw.path64 -LIBS := ../OSlibs/win/libsecp256k1.a ../OSlibs/win/libcrypto.a ../OSlibs/win/libssl.a ../OSlibs/win/libpthreadGC2_64.a ../agents/win64/libcrypto777.a ../OSlibs/win/libcurldll.a $(TOOL_DIR)/lib/libws2_32.a $(TOOL_DIR)/lib/libgdi32.a -I$(TOOL_DIR)/include -I$(APP)/iguana -I$(APP)/includes -I$(APP)/crypto777 +LIBS := ../OSlibs/win/libsecp256k1.a ../OSlibs/win/libcrypto.a ../OSlibs/win/libssl.a ../agents/win64/libcrypto777.a ../OSlibs/win/libcurldll.a $(TOOL_DIR)/lib/libws2_32.a $(TOOL_DIR)/lib/libgdi32.a -I$(TOOL_DIR)/include -I$(APP)/iguana -I$(APP)/includes -I$(APP)/crypto777 -I../OSlibs/win -L../OSlibs/win/x64 -lpthreadGC2 include mingw64_inc diff --git a/iguana/mingw64_inc b/iguana/mingw64_inc index d8a4c85d6..e1101a800 100755 --- a/iguana/mingw64_inc +++ b/iguana/mingw64_inc @@ -1,6 +1,6 @@ include iguana.sources all: - $(TOOL_DIR)/bin/$(MINGW) -w -o ../agents/win64/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) -lws2_32 -lpthread + $(TOOL_DIR)/bin/$(MINGW) -w -D__CLEANUP_C -DPTW32_STATIC_LIB -o ../agents/win64/iguana.exe -D __MINGW -D __CURL_CURLBUILD_H -D __CURL_CURL_H -D __CURL_EASY_H $(SOURCES) $(LIBS) $(TOOL_DIR)/bin/strip --strip-all ../agents/win64/iguana.exe