Merge remote-tracking branch 'purple/openssl' into merge-recent-udp-tunnel

This commit is contained in:
Jeff Becker 2016-10-10 08:36:06 -04:00
commit 22250ae552
No known key found for this signature in database
GPG Key ID: AB950234D6EA286B

View File

@ -37,7 +37,8 @@ ifeq ($(USE_WIN32_APP), yes)
DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
endif
ifeq ($(USE_AESNI),yes)
# don't change following line to ifeq ($(USE_AESNI),yes) !!!
ifeq ($(USE_AESNI),1)
CPU_FLAGS = -maes -DAESNI
else
CPU_FLAGS = -msse