From 4e20638582befe37dc04b3d1d6fe0a7ead8507f0 Mon Sep 17 00:00:00 2001 From: Shailesh Date: Wed, 17 Aug 2016 15:26:09 +0200 Subject: [PATCH 1/2] Update commands for android build --- crypto777/m_android | 11 +++++++++-- iguana/m_android | 22 ++++++++++++++++------ iguana/secp256k1/m_android | 4 +++- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/crypto777/m_android b/crypto777/m_android index b84f37742..d58e90d65 100755 --- a/crypto777/m_android +++ b/crypto777/m_android @@ -1,2 +1,9 @@ -git pull -cd iguana; ./m_android; cd .. +#!/bin/bash + +if [[ $# -eq 0 ]]; then + git pull + #cd iguana; ./m_android; cd .. +fi +echo "Compiling crypto777..." +$CC2 -c -O2 *.c jpeg/*.c jpeg/unix/*.c +rm -f ../agents/libcrypto777.a; $AR rcu ../agents/libcrypto777.a *.o diff --git a/iguana/m_android b/iguana/m_android index e723b2921..83945b909 100755 --- a/iguana/m_android +++ b/iguana/m_android @@ -1,8 +1,18 @@ +#!/bin/bash + rm ../agents/iguana *.o -git pull -cd secp256k1; ./m_unix; cd .. -$CC2 -g -Wno-deprecated -c -O2 *.c databases/iguana_DB.c -$CC2 -g -Wno-deprecated -c main.c iguana777.c iguana_bundles.c -#$CC2 -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lcurl -lssl -lcrypto -lpthread -lm #../includes/libsecp256k1.a -lgmp -$CC2 -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lpthread -lm +if [[ $# -eq 0 ]]; then + git pull +fi + +echo "Compiling libsecp256k1.a ..." +cd secp256k1; ./m_android; cd .. + +#$CC2 -o ../agents/iguana -O2 *.c ../basilisk/*.c -I $NDK/platforms/android-19/arch-arm/usr/include ../agents/libcrypto777.a ../agents/libsecp256k1.a ../OSlibs/android/lib/libcurl.a -lssl -lcrypto -lm -lc -lz + +echo "Compiling iguana ... " +#$CC2 -o ../agents/iguana -O2 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c -I ./secp256k1/include -I $NDK/platforms/android-21/arch-arm/usr/include ../agents/libcrypto777.a ../agents/libsecp256k1.a ../OSlibs/android/lib/libcurl.a -L../OSlibs/android/lib/ -lssl -lcrypto -L$NDK/platforms/android-21/arch-arm/usr/lib -lm -lc -lz -nostdlib -lgcc +$CC2 -g -Wno-deprecated -O2 -c *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c +$CC2 -g -Wno-deprecated -c main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c +$CC2 -g -o ../agents/iguana -O2 *.o ../agents/libcrypto777.a -lm diff --git a/iguana/secp256k1/m_android b/iguana/secp256k1/m_android index 2409bd7f4..c9c3fc441 100755 --- a/iguana/secp256k1/m_android +++ b/iguana/secp256k1/m_android @@ -1 +1,3 @@ -$CC2 -c -o ../secp256k1.o -I. -I./src -I./include -I./src -O3 -W -std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings -fvisibility=hidden -DHAVE_CONFIG_H src/secp256k1.c +#$CC -c -o ../secp256k1.o -I. -I./src -I /Newpub/android-ndk-r9b/platforms/android-19/arch-arm/usr/include -I./include -I./src -O3 -W -std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings -fvisibility=hidden -DHAVE_CONFIG_H src/secp256k1.c + +$CC2 -c -o ../sec256k1.o -I. -I./src -I./include -I./src -O3 -W -std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings -fvisibility=hidden -DHAVE_CONFIG_H src/secp256k1.c From 35c368af7cbcba1c8f0cf8a662f44696a605c086 Mon Sep 17 00:00:00 2001 From: Shailesh Date: Wed, 17 Aug 2016 15:27:33 +0200 Subject: [PATCH 2/2] Add missing header file for crypto777 and iguana777 --- crypto777/inet.c | 1 + iguana/iguana777.h | 1 + 2 files changed, 2 insertions(+) diff --git a/crypto777/inet.c b/crypto777/inet.c index 87113f392..850ee6dee 100755 --- a/crypto777/inet.c +++ b/crypto777/inet.c @@ -19,6 +19,7 @@ #ifndef crypto777_inet_h #define crypto777_inet_h #include "OS_portable.h" +#include #ifdef _WIN32 #define in6_addr sockaddr diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 9e844484c..18e594bd3 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -31,6 +31,7 @@ struct supernet_info; struct exchange_info; +#include #include "../crypto777/OS_portable.h" #include "../datachain/datachain.h"