Modify guilding conditions to prevent unexpected results in case if USE_ASM and USE_SSE2 are both enabled. USE_SSE2 has a sense only for generic module.
# use: qmake "USE_ASM=1"
contains(USE_ASM, 1) {
- message(Using optimized scrypt core implementation)
+ message(Using assembler scrypt core implementation)
SOURCES += src/scrypt-arm.S src/scrypt-x86.S src/scrypt-x86_64.S
} else {
- message(Using generic scrypt core implementation)
+ # use: qmake "USE_SSE2=1"
+ contains(USE_SSE2, 1) {
+ message(Using SSE2 intrinsic scrypt implementation)
+ SOURCES += src/scrypt-sse2.cpp
+ DEFINES += USE_SSE2
+ QMAKE_CXXFLAGS += -msse2
+ QMAKE_CFLAGS += -msse2
+ } else {
+ message(Using generic scrypt core implementation)
+ }
+
+ # For now, generic module is required in both cases
SOURCES += src/scrypt-generic.c
}
-# use: qmake "USE_SSE2=1"
-contains(USE_SSE2, 1) {
- message(Using SSE2 scrypt core implementation)
- SOURCES += src/scrypt-sse2.cpp
- DEFINES += USE_SSE2
- QMAKE_CXXFLAGS += -msse2
- QMAKE_CFLAGS += -msse2
-}
# regenerate src/build.h
!windows|contains(USE_BUILD_INFO, 1) {
genbuild.depends = FORCE
obj/scrypt-generic.o: scrypt-generic.c
$(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
ifeq (${USE_SSE2}, 1)
- DEFS += -DUSE_SSE2
- OBJS += obj/scrypt-sse2.o
+DEFS += -DUSE_SSE2
+OBJS += obj/scrypt-sse2.o
obj/scrypt-sse2.o: scrypt-sse2.cpp
$(CXX) -c $(CFLAGS) -MMD -o $@ $<
endif
+endif
+
# auto-generated dependencies:
-include obj/*.P
obj/scrypt-x86_64.o: scrypt-x86_64.S
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
endif
+
ifneq (${USE_ASM}, 1)
OBJS += obj/scrypt-generic.o
obj/scrypt-generic.o: scrypt-generic.c
$(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
ifeq (${USE_SSE2}, 1)
- DEFS += -DUSE_SSE2
- OBJS += obj/scrypt-sse2.o
+DEFS += -DUSE_SSE2
+OBJS += obj/scrypt-sse2.o
+
obj/scrypt-sse2.o: scrypt-sse2.cpp $(HEADERS)
$(CCX) -c $(CFLAGS) -MMD -o $@ $<
endif
+endif
+
obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
OBJS += obj/txdb-leveldb.o
leveldb/libleveldb.a:
- cd leveldb;TARGET_OS=NATIVE_WINDOWS make libleveldb.a libmemenv.a;; cd ..
+ cd leveldb;TARGET_OS=NATIVE_WINDOWS make libleveldb.a libmemenv.a;; cd ..
obj/txdb-leveldb.o: leveldb/libleveldb.a
else
OBJS += obj/txdb-bdb.o
obj/scrypt-generic.o: scrypt-generic.c
$(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
-ifeq (${USE_SSE2}, 1)
- DEFS += -DUSE_SSE2
- OBJS += obj/scrypt-sse2.o
+ifdef USE_SSE2
+DEFS += -DUSE_SSE2
+OBJS += obj/scrypt-sse2.o
+
obj/scrypt-sse2.o: scrypt-sse2.cpp $(HEADERS)
g++ -c $(CFLAGS) -MMD -o $@ $<
endif
+endif
+
+
obj/%.o: %.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<
obj/scrypt-generic.o: scrypt-generic.c
$(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
-ifeq (${USE_SSE2}, 1)
- DEFS += -DUSE_SSE2
- OBJS += obj/scrypt-sse2.o
+ifneq (${USE_SSE2}, 1) and eq (${USE_ASM}, 1)
+DEFS += -DUSE_SSE2
+OBJS += obj/scrypt-sse2.o
+
obj/scrypt-sse2.o: scrypt-sse2.cpp
$(CXX) -c $(CFLAGS) -MMD -o $@ $<
endif
+endif
+
# auto-generated dependencies:
-include obj/*.P
obj/scrypt-generic.o: scrypt-generic.c
$(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
ifeq (${USE_SSE2}, 1)
- DEFS += -DUSE_SSE2
- OBJS += obj/scrypt-sse2.o
+DEFS += -DUSE_SSE2
+OBJS += obj/scrypt-sse2.o
+
obj/scrypt-sse2.o: scrypt-sse2.cpp
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
endif
+endif
+
# auto-generated dependencies:
-include obj/*.P