ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-06 19:19:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more fun with makefiles

Browse Source
This commit is contained in:
Grant Limberg 2022-02-03 11:47:03 -08:00
parent cfae20e0df
commit df6bbb0b0c
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
make-linux.mk
View File

@ -41,14 +41,6 @@ else
override DEFS+=-DZT_USE_SYSTEM_NATPMP override DEFS+=-DZT_USE_SYSTEM_NATPMP
endif endif
ifeq ($(ZT_SSO_SUPPORTED), 1)
ifeq ($(ZT_DEBUG),1)
LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl -lssl -lcrypto
else
LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl -lssl -lcrypto
endif
endif
# Use bundled http-parser since distribution versions are NOT API-stable or compatible! # Use bundled http-parser since distribution versions are NOT API-stable or compatible!
# Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
ONE_OBJS+=ext/http-parser/http_parser.o ONE_OBJS+=ext/http-parser/http_parser.o
@ -178,6 +170,7 @@ ifeq ($(CC_MACH),armhf)
ZT_ARCHITECTURE=3 ZT_ARCHITECTURE=3
override DEFS+=-DZT_NO_TYPE_PUNNING override DEFS+=-DZT_NO_TYPE_PUNNING
ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ZT_USE_ARM32_NEON_ASM_CRYPTO=1
ZT_SSO_SUPPORTED=1
endif endif
ifeq ($(CC_MACH),armv6) ifeq ($(CC_MACH),armv6)
ZT_ARCHITECTURE=3 ZT_ARCHITECTURE=3
@ -269,6 +262,14 @@ ifeq ($(ZT_IA32),1)
ZT_USE_X64_ASM_ED25519=0 ZT_USE_X64_ASM_ED25519=0
endif endif
ifeq ($(ZT_SSO_SUPPORTED), 1)
ifeq ($(ZT_DEBUG),1)
LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl -lssl -lcrypto
else
LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl -lssl -lcrypto
endif
endif
# Disable software updates by default on Linux since that is normally done with package management # Disable software updates by default on Linux since that is normally done with package management
override DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\"" override DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""