diff options
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/make-linux.mk b/make-linux.mk index 5a76c546..892b40b6 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -9,27 +9,6 @@ LIBS= include objects.mk OBJS+=osdep/LinuxEthernetTap.o -# Enable SSE-optimized Salsa20 on x86 and x86_64 machines -MACHINE=$(shell uname -m) -ifeq ($(MACHINE),x86_64) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),amd64) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),i686) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),i586) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),i386) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),x86) - DEFS+=-DZT_SALSA20_SSE -endif - # "make official" is a shortcut for this ifeq ($(ZT_OFFICIAL_RELEASE),1) ZT_AUTO_UPDATE=1 @@ -91,6 +70,6 @@ debug: FORCE official: FORCE make -j 4 ZT_OFFICIAL_RELEASE=1 - ./buildinstaller.sh + make ZT_OFFICIAL_RELEASE=1 installer FORCE: |