diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 12:49:36 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 12:49:36 -0700 |
| commit | 3d6c1860ca8169f618ad70ae92e4a8cd2f4746c8 (patch) | |
| tree | ca93fd3ca8dc6fb9afffcc78b0167a3c6d204eec /make-linux.mk | |
| parent | f0be5e814eb0c9496d6c163e2d5bc213e7b483c4 (diff) | |
| parent | 79efceb57bd71e91f5733dc4c54b3213a3f95636 (diff) | |
| download | infinitytier-3d6c1860ca8169f618ad70ae92e4a8cd2f4746c8.tar.gz infinitytier-3d6c1860ca8169f618ad70ae92e4a8cd2f4746c8.zip | |
Merge branch 'adamierymenko-dev' into android-jni
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: |