github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 05:43:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'dev' into edge

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-28 07:31:33 -07:00
commit 9d1207b339
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
10 changed files with 17 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

3
attic/make-linux.mk
View file

@ -332,8 +332,7 @@ official: FORCE
make -j4 ZT_OFFICIAL=1 all
docker: FORCE
make clean ; make -j4 one
docker build -f docker/Dockerfile .
docker build -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized .
central-controller: FORCE
make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one