diff --git a/.travis.yml b/.travis.yml index 359ff732..661b9c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,7 +89,7 @@ script: mkdir cryptopp-build cd cryptopp-build cmake $CRYPTOPP_DIR - make -j 4 + make -j 4 VERBOSE=1 ./cryptest.exe v ./cryptest.exe tv all else diff --git a/GNUmakefile b/GNUmakefile index 5bba5a14..2f6c793c 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -868,7 +868,7 @@ aria-simd.o : aria-simd.cpp $(CXX) $(strip $(CXXFLAGS) $(ARIA_FLAG) -c) $< # SSE4.2 or NEON available -neon.o : neon-simd.cpp +neon-simd.o : neon-simd.cpp $(CXX) $(strip $(CXXFLAGS) $(NEON_FLAG) -c) $< # SSE4.2 or ARMv8a available diff --git a/cryptest.nmake b/cryptest.nmake index 2949b6d5..1f448c01 100644 --- a/cryptest.nmake +++ b/cryptest.nmake @@ -128,7 +128,7 @@ LDLIBS = $(LDLIBS) ws2_32.lib kernel32.lib # CXXFLAGS = $(CXXFLAGS) /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP LIB_SRCS = $(LIB_SRCS) neon-simd.cpp -LIB_OBJS = $(LIB_OBJS) neon.obj +LIB_OBJS = $(LIB_OBJS) neon-simd.obj # CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP # LDLIBS = $(LDLIBS) ws2_32.lib !ENDIF