Merge pull request #42 from usamir/master

Master

crypto777/make_win32

@@ -1,12 +1,14 @@
 include crypto777.sources
 include ../mingw.path
 
-all: clean build
+all: clean copy build
+copy :
+	cp -f ../win/pthreadGC2.dll ../agents/win32/pthreadGC2.dll
 
 build :
 	mkdir -p ../agents/win32 || true
 	@echo "\nBuilding crypto777....."
-	$(TOOL_DIR)/bin/$(MINGW) -w -D __MINGW -DHAVE_STRUCT_TIMESPEC -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I$(APP)/includes/openssl -I$(APP)/crypto777 || (echo -e "\033[4mERROR: Compilation failed for win32 \033[0m"; exit 1; )
+	$(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)-ar rcu ../agents/win32/libcrypto777.a *.o || (echo -e "\033[4mERROR: Failed to create libcrypto777.a\033[0m"; exit 1; )
 	@echo "\Build Successful......"

crypto777/make_win64

@@ -5,13 +5,14 @@ all: clean build
 
 build:
 	mkdir -p ../agents/win64 || true
-	@echo "\nBuilding crypto......"
-	$(TOOL_DIR)/bin/$(MINGW) -w -D __MINGW -DHAVE_STRUCT_TIMESPEC -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I$(APP)/includes/openssl || (echo "\033[4m ERROR: Compilation failed for win64\033[0m"; exit 1; )
+	@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)-ar rcu ../agents/win64/libcrypto777.a *.o || (echo "\033[4mERROR: Failed to create libcrypto777.a\033[0m"; exit 1; )
-
+	@echo "\Build Successful......"
 
 clean:
 	@echo "\nCleaning files......"
 	rm -f ../agents/win64/* || true
 	rm -f *.o || true
+	@echo "\nCleaned all files......"

crypto777/mingw

@@ -1,6 +1,6 @@
 include crypto777.sources
 
 all: 
-	$(TOOL_DIR)/bin/$(MINGW) -w -D __MINGW -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I$(APP)/includes/openssl -I$(APP)/crypto777 
+	$(TOOL_DIR)/bin/$(MINGW) -w -D __MINGW -c $(CRYPTO777_SRCS) -I$(TOOL_DIR)/include -I../includes/openssl -I../crypto777 
 	$(TOOL_DIR)/bin/$(MINGW)-ar rcu ../agents/win32/libcrypto777.a *.o
 	rm *.o

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) -lws2_32 -lpthread -DHAVE_STRUCT_TIMESPEC || (echo -e "\033[4mERROR: Failed to build iguana\033[0m"; exit 1; )
+	$(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/strip --strip-all ../agents/win32/iguana.exe

iguana/make_win64

@@ -1,17 +1,17 @@
 include iguana.sources
 include ../mingw.path64
 
-LIBS := ../win/libsecp256k1.a ../win/libcrypto.a ../win/libssl.a ../win/libpthreadGC2_64.a ../agents/win64/libcrypto777.a ../win/libcurldll.a $(TOOL_DIR)/lib/libws2_32.a  $(TOOL_DIR)/lib/libgdi32.a -I$(TOOL_DIR)/include -I/usr/i386/include -I/usr/i386/include/curl -I$(APP)/iguana -I$(APP)/includes -I$(APP)/crypto777 
+LIBS := ../win/libsecp256k1.a ../win/libcrypto.a ../win/libssl.a ../agents/win64/libcrypto777.a ../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
 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) -lws2_32 -lpthread -DHAVE_STRUCT_TIMESPEC || (echo -e "\033[4mERROR: Failed to build iguana\033[0m"; exit 1; )
+	$(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/strip --strip-all ../agents/win64/iguana.exe  || (echo -e "\033[4mERROR: Failed to strip iguana\033[0m"; exit 1; )
-
+	@echo "\Build Successful......"
 
 check:
 	test -s ../agents/win64/libcrypto777.a  || (echo -e "\033[4mERROR: libcrypto777.a does not exists\033[0m"; exit 1; )

iguana/mingw

@@ -1,6 +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) -lws2_32 -lpthread   
+	$(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/strip --strip-all ../agents/win32/iguana.exe
-

iguana/mingw32

@@ -1,4 +1,4 @@
 include ../mingw.path
-LIBS := $(TOOL_DIR)/lib/libpthread.a ../agents/win32/libcrypto777.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 := ../agents/win32/libcrypto777.a  $(TOOL_DIR)/lib/libws2_32.a -L../win  $(TOOL_DIR)/lib/libgdi32.a -I$(TOOL_DIR)/include -I../iguana -I../includes -I../crypto777 -lws2_32 -lpthreadGC2
 
 include mingw

mingw.path

@@ -1,3 +1,2 @@
-TOOL_DIR := /D/MinGW
-MINGW := mingw32-gcc
-APP := /C/Users/usamir/Documents/GitHub/SuperNET
+TOOL_DIR := C:/MinGW/32
+MINGW := gcc

mingw.path64

@@ -1,3 +1,2 @@
-TOOL_DIR := /D/MinGW
-MINGW := mingw32-gcc
-APP := /C/Users/usamir/Documents/GitHub/SuperNET
+TOOL_DIR := C:/MinGW/64
+MINGW := gcc