Browse Source

Merge pull request #240 from ca333/dev

OS independant struct typedefinition
etomic
jl777 8 years ago
committed by GitHub
parent
commit
d153862b3f
  1. 5
      README.md
  2. 9
      basilisk/tradebots_SVM.h
  3. 2
      iguana/m_unix

5
README.md

@ -24,7 +24,7 @@ komodo: this is the top secret project I cant talk about publicly yet
> #TL;DR# > #TL;DR#
> >
> ```sudo apt-get update; sudo apt-get install git libcurl4-openssl-dev build-essential; git clone https://github.com/jl777/SuperNET; cd SuperNET; ./m_onetime m_unix;``` > ```sudo apt-get update; sudo apt-get install git libcurl4-openssl-dev build-essential libnanomsg-dev; git clone https://github.com/jl777/SuperNET; cd SuperNET; ./m_onetime m_unix;```
> >
> The above one line gets SuperNET installed, built and launched for unix. > The above one line gets SuperNET installed, built and launched for unix.
> >
@ -44,6 +44,8 @@ The above two definitions need to be changed to match the mingw install on your
You need to make sure the nacl sdk is properly installed and you are able to build the examples. You need to make sure the nacl sdk is properly installed and you are able to build the examples.
Now you will need to get the external libs, which can be built from scratch using naclports or there use the reference builds of libcurl.a and libz.a in the SuperNET/crypto777/pnacl_libs. You can just copy those over into $(NACL_SDK_ROOT)/<pepper_dir>/lib/pnacl. Now you will need to get the external libs, which can be built from scratch using naclports or there use the reference builds of libcurl.a and libz.a in the SuperNET/crypto777/pnacl_libs. You can just copy those over into $(NACL_SDK_ROOT)/<pepper_dir>/lib/pnacl.
##For android##
You have to build a native libnanomsg for android. This section is work in progress. Contact ca333@protonmail.ch for assistance on building latest iguana for android.
#ONETIME# #ONETIME#
Now you are ready to build. Now you are ready to build.
@ -221,4 +223,3 @@ sudo service ntp start
Now things should be ready. To update and run notary node: Now things should be ready. To update and run notary node:
pkill iguana; ./m_LP; tests/notaryinit pkill iguana; ./m_LP; tests/notaryinit

9
basilisk/tradebots_SVM.h

@ -20,16 +20,14 @@
//#include <dispatch/dispatch.h> //#include <dispatch/dispatch.h>
typedef float svmtype; typedef float svmtype;
#ifdef WIN32
// fadedreamz@gmail.com - added for successful compilation, however, for MSVC probably require a particular OpenCL SDK // fadedreamz@gmail.com - added for successful compilation, however, for MSVC probably require a particular OpenCL SDK
// to work with it (e,g nvidia or amd SDK) // to work with it (e,g nvidia or amd SDK)
typedef struct fake_opencl_double { typedef struct fake_opencl_double { //use a struct for double2 typedefinition on all OS - ca333@protonmail.ch
double x; double x;
double y; double y;
}double2; }double2;
#else
typedef double double2 __attribute__((ext_vector_type(2)));
#endif
#define MAX_VECTORS (1440 * 365 * 5) #define MAX_VECTORS (1440 * 365 * 5)
#define MAIN_MAXCORES 16 #define MAIN_MAXCORES 16
#define c_to_refc(c) (c) #define c_to_refc(c) (c)
@ -1072,4 +1070,3 @@ int32_t ocas_gen(int32_t c,int32_t numfeatures,int32_t starti,int32_t endi)
return(0); return(0);
} }
#endif #endif

2
iguana/m_unix

@ -9,4 +9,4 @@ cd secp256k1; ./m_unix; cd ..
cd ../crypto777; ./m_unix; cd ../iguana cd ../crypto777; ./m_unix; cd ../iguana
gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c
gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c
gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lpthread -lm gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lpthread -lm -lnanomsg

Loading…
Cancel
Save