From: MASM fan Date: Tue, 25 Nov 2014 16:30:05 +0000 (+0400) Subject: Remove unnecessary ARM references X-Git-Tag: nvc-v0.5.0~22 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=734daea5c4dd864e2b86de555c4b628a8cfe856a Remove unnecessary ARM references --- diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 8bed0ff..570bd3b 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -111,7 +111,7 @@ OBJS += obj/txdb-bdb.o endif ifeq (${USE_ASM}, 1) -OBJS += obj/scrypt-arm.o obj/scrypt-x86.o obj/scrypt-x86_64.o +OBJS += obj/scrypt-x86.o obj/scrypt-x86_64.o obj/scrypt-x86.o: scrypt-x86.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< diff --git a/src/makefile.mingw b/src/makefile.mingw index 9a40913..74006f7 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -102,7 +102,7 @@ OBJS += obj/txdb-bdb.o endif ifdef USE_ASM -OBJS += obj/scrypt-arm.o obj/scrypt-x86.o obj/scrypt-x86_64.o +OBJS += obj/scrypt-x86.o obj/scrypt-x86_64.o obj/scrypt-x86.o: scrypt-x86.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< diff --git a/src/makefile.osx b/src/makefile.osx index 3b6353d..1570fbd 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -129,16 +129,13 @@ OBJS += obj/txdb-bdb.o endif ifeq (${USE_ASM}, 1) -OBJS += obj/scrypt-arm.o obj/scrypt-x86.o obj/scrypt-x86_64.o +OBJS += obj/scrypt-x86.o obj/scrypt-x86_64.o obj/scrypt-x86.o: scrypt-x86.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< obj/scrypt-x86_64.o: scrypt-x86_64.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< - -obj/scrypt-arm.o: scrypt-arm.S - $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< endif ifneq (${USE_ASM}, 1) OBJS += obj/scrypt-generic.o