diff --git a/crypto777/Makefile b/crypto777/Makefile index ba83510c4..e202396bf 100755 --- a/crypto777/Makefile +++ b/crypto777/Makefile @@ -11,7 +11,7 @@ NACL_SDK_ROOT ?= $(abspath $(CURDIR)) TARGET = crypto777 -EXTRA= -D__PNACL -O2 +EXTRA= -D__PNACL -O2 -DLIQUIDITY_PROVIDER=1 #include $(NACL_SDK_ROOT)/tools/common.mk include tools/common.mk diff --git a/crypto777/bitcoind_RPC.c b/crypto777/bitcoind_RPC.c index 856edfd6d..f292f68db 100755 --- a/crypto777/bitcoind_RPC.c +++ b/crypto777/bitcoind_RPC.c @@ -19,7 +19,7 @@ #define LIQUIDITY_PROVIDER 1 #endif -#ifdef LIQUIDITY_PROVIDER +#if LIQUIDITY_PROVIDER #ifdef _WIN32 #include #include diff --git a/crypto777/m_LP b/crypto777/m_LP index bc3a4c1c2..259846c31 100755 --- a/crypto777/m_LP +++ b/crypto777/m_LP @@ -1,4 +1,4 @@ git pull rm *.o -gcc -c -DLIQUIDITY_PROVIDER -O2 *.c jpeg/*.c jpeg/unix/*.c -I/usr/lib/x86_64-linux-gnu/curl +gcc -c -DLIQUIDITY_PROVIDER=1 -O2 *.c jpeg/*.c jpeg/unix/*.c -I/usr/lib/x86_64-linux-gnu/curl rm -f ../agents/libcrypto777.a; ar rcu ../agents/libcrypto777.a *.o diff --git a/iguana/Makefile b/iguana/Makefile index e558ddc17..2fd6616bb 100755 --- a/iguana/Makefile +++ b/iguana/Makefile @@ -26,9 +26,9 @@ DEPS = nacl_io #LIBS = crypto777 curl ssl crypto z pthread ppapi nacl_io #DEPS = nacl_io #LIBS = crypto777 curl ssl crypto z glibc-compat nacl_spawn ppapi nacl_io ppapi_simple # cli_main ppapi_cpp ppapi_simple -LIBS = crypto777 glibc-compat nacl_spawn ppapi nacl_io #ppapi_simple +LIBS = crypto777 curl ssl crypto z glibc-compat nacl_spawn ppapi nacl_io ppapi_simple -CFLAGS = -Wall -O2 -fno-strict-aliasing $(EXTRA) +CFLAGS = -Wall -O2 -DLIQUIDITY_PROVIDER=1 -fno-strict-aliasing $(EXTRA) LFLAGS = libs # Build rules generated by macros from common.mk: diff --git a/iguana/iguana_exchanges.c b/iguana/iguana_exchanges.c index f39525093..3cfb1ae4e 100755 --- a/iguana/iguana_exchanges.c +++ b/iguana/iguana_exchanges.c @@ -84,14 +84,14 @@ double instantdex_aveprice(struct supernet_info *myinfo,struct exchange_quote *s else if ( dir > 0 && active[i]->numasks > 0 ) n = instantdex_updatesources(active[i]->exchange,sortbuf,n,max,i,-1,&active[i]->bidasks[1],active[i]->numasks); } - printf("numexchanges.%d dir.%d %s/%s numX.%d n.%d\n",myinfo->numexchanges,dir,base,rel,num,n); + //printf("numexchanges.%d dir.%d %s/%s numX.%d n.%d\n",myinfo->numexchanges,dir,base,rel,num,n); if ( dir < 0 ) revsort64s(&sortbuf[0].satoshis,n,sizeof(*sortbuf)); else sort64s(&sortbuf[0].satoshis,n,sizeof(*sortbuf)); for (totalvol=pricesum=i=0; in %d block.%p/%p ramchain.%p databad.%d prevnonz.%d\n",coin->RTheight,coin->blocks.hwmchain.height,coin->RTstarti,bp->n,block,bp->blocks[bundlei],dest->H.data,coin->RTdatabad,bits256_nonz(block->RO.prev_block)); + //printf("RT.%d vs hwm.%d starti.%d bp->n %d block.%p/%p ramchain.%p databad.%d prevnonz.%d\n",coin->RTheight,coin->blocks.hwmchain.height,coin->RTstarti,bp->n,block,bp->blocks[bundlei],dest->H.data,coin->RTdatabad,bits256_nonz(block->RO.prev_block)); } else { diff --git a/iguana/m_LP b/iguana/m_LP index 6a2c879fb..222dccae4 100755 --- a/iguana/m_LP +++ b/iguana/m_LP @@ -2,6 +2,6 @@ rm ../agents/iguana *.o git pull cd secp256k1; ./m_unix; cd .. -gcc -g -Wno-deprecated -c -O2 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c -gcc -g -Wno-deprecated -c main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c +gcc -g -Wno-deprecated -c -O2 -DLIQUIDITY_PROVIDER=1 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c +gcc -g -Wno-deprecated -c -DLIQUIDITY_PROVIDER=1 main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lcurl -lssl -lcrypto -lpthread -lz -lm