diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-21 08:09:18 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-21 08:09:18 -0700 |
| commit | 8b0ce1cc008cc617e5d01258063d7f7a75959fff (patch) | |
| tree | 2f276083a0faf0c60cfe93b72b238a3ee21e42e7 | |
| parent | 0e88c73f68c405cdc8af3b98ab2f58efe54d943f (diff) | |
| download | infinitytier-8b0ce1cc008cc617e5d01258063d7f7a75959fff.tar.gz infinitytier-8b0ce1cc008cc617e5d01258063d7f7a75959fff.zip | |
More BSD make fixes.
| -rw-r--r-- | make-bsd.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/make-bsd.mk b/make-bsd.mk index 9efa707b..85bf69f5 100644 --- a/make-bsd.mk +++ b/make-bsd.mk @@ -112,6 +112,16 @@ ERR=$(error FATAL: architecture could not be determined from $(CC) -dumpmachine: err: ; $(ERR) endif +# Build faster crypto on some targets +ifeq ($(ZT_USE_X64_ASM_SALSA2012),1) + override DEFS+=-DZT_USE_X64_ASM_SALSA2012 + override OBJS+=ext/x64-salsa2012-asm/salsa2012.o +endif +ifeq ($(ZT_USE_ARM32_NEON_ASM_SALSA2012),1) + override DEFS+=-DZT_USE_ARM32_NEON_ASM_SALSA2012 + override OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o +endif + DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\"" CXXFLAGS+=$(CFLAGS) -fno-rtti -std=c++11 #-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH -D_GLIBCXX_USE_C99_MATH_TR1 @@ -129,7 +139,7 @@ selftest: $(OBJS) selftest.o $(STRIP) zerotier-selftest clean: - rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* + rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* $(OBJS) debug: FORCE make -j 4 ZT_DEBUG=1 |