Merge pull request #41 from fsb4000/miniupnpc

Miniupnpc

diff --combined novacoin-qt.pro
index 8d16160,d276a99..f6b3f81
--- 1/novacoin-qt.pro
--- 2/novacoin-qt.pro
+++ b/novacoin-qt.pro
@@@ -18,18 -18,17 +18,18 @@@ CONFIG += stati
  # Dependency library locations can be customized with:
  #    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
  #    BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
 -BOOST_LIB_SUFFIX=-mgw49-mt-s-1_55
 -BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
 -BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
 -BDB_INCLUDE_PATH=C:/deps/db-6.0.20/build_unix
 -BDB_LIB_PATH=C:/deps/db-6.0.20/build_unix
 -OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include
 -OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j
 -MINIUPNPC_INCLUDE_PATH=C:/deps/
 -MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
 -QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
 -QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
 +
 +#BOOST_LIB_SUFFIX=-mgw49-mt-s-1_55
 +#BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
 +#BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
 +#BDB_INCLUDE_PATH=C:/deps/db-6.0.20/build_unix
 +#BDB_LIB_PATH=C:/deps/db-6.0.20/build_unix
 +#OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include
 +#OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j
 +#MINIUPNPC_INCLUDE_PATH=C:/deps/
 +#MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
 +#QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
 +#QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
  
  OBJECTS_DIR = build
  MOC_DIR = build
@@@ -76,7 -75,7 +76,7 @@@ contains(USE_UPNP, -) 
      count(USE_UPNP, 0) {
          USE_UPNP=1
      }
-     DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
+     DEFINES += USE_UPNP=$$USE_UPNP STATICLIB MINIUPNP_STATICLIB
      INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
      LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
      win32:LIBS += -liphlpapi
@@@ -135,14 -134,6 +135,14 @@@ contains(USE_LEVELDB, 1) 
      SOURCES += src/txdb-bdb.cpp
  }
  
 +contains(USE_ASM, 1) {
 +    message(Using optimized scrypt core implementation)
 +    SOURCES += src/scrypt-arm.S src/scrypt-x86.S src/scrypt-x86_64.S
 +} else {
 +    message(Using generic scrypt core implementation)
 +    SOURCES += src/scrypt-generic.c
 +}
 +
  # regenerate src/build.h
  !windows|contains(USE_BUILD_INFO, 1) {
      genbuild.depends = FORCE
@@@ -199,6 -190,17 +199,6 @@@ HEADERS += src/qt/bitcoingui.h 
      src/kernel.h \
      src/scrypt.h \
      src/pbkdf2.h \
 -    src/zerocoin/Accumulator.h \
 -    src/zerocoin/AccumulatorProofOfKnowledge.h \
 -    src/zerocoin/Coin.h \
 -    src/zerocoin/CoinSpend.h \
 -    src/zerocoin/Commitment.h \
 -    src/zerocoin/ParamGeneration.h \
 -    src/zerocoin/Params.h \
 -    src/zerocoin/SerialNumberSignatureOfKnowledge.h \
 -    src/zerocoin/SpendMetaData.h \
 -    src/zerocoin/ZeroTest.h \
 -    src/zerocoin/Zerocoin.h \
      src/serialize.h \
      src/strlcpy.h \
      src/main.h \
@@@ -317,8 -319,21 +317,8 @@@ SOURCES += src/qt/bitcoin.cpp src/qt/bi
      src/qt/rpcconsole.cpp \
      src/noui.cpp \
      src/kernel.cpp \
 -    src/scrypt-arm.S \
 -    src/scrypt-x86.S \
 -    src/scrypt-x86_64.S \
      src/scrypt.cpp \
 -    src/pbkdf2.cpp \
 -    src/zerocoin/Accumulator.cpp \
 -    src/zerocoin/AccumulatorProofOfKnowledge.cpp \
 -    src/zerocoin/Coin.cpp \
 -    src/zerocoin/CoinSpend.cpp \
 -    src/zerocoin/Commitment.cpp \
 -    src/zerocoin/ParamGeneration.cpp \
 -    src/zerocoin/Params.cpp \
 -    src/zerocoin/SerialNumberSignatureOfKnowledge.cpp \
 -    src/zerocoin/SpendMetaData.cpp \
 -    src/zerocoin/ZeroTest.cpp
 +    src/pbkdf2.cpp
  
  RESOURCES += \
      src/qt/bitcoin.qrc

diff --combined src/makefile.mingw
index 6a808b0,b2fea27..9a40913
--- 1/src/makefile.mingw
--- 2/src/makefile.mingw
+++ b/src/makefile.mingw
@@@ -39,7 -39,7 +39,7 @@@ ifneq (${USE_UPNP}, -
   INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
   LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
   LIBS += -l miniupnpc -l iphlpapi
-  DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
+  DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) -DMINIUPNP_STATICLIB
  endif
  
  ifneq (${USE_IPV6}, -)
@@@ -82,7 -82,19 +82,7 @@@ OBJS= 
      obj/noui.o \
      obj/kernel.o \
      obj/pbkdf2.o \
 -    obj/scrypt.o \
 -    obj/scrypt-x86.o \
 -    obj/scrypt-x86_64.o \
 -    obj/zerocoin/Accumulator.o \
 -    obj/zerocoin/AccumulatorProofOfKnowledge.o \
 -    obj/zerocoin/Coin.o \
 -    obj/zerocoin/CoinSpend.o \
 -    obj/zerocoin/Commitment.o \
 -    obj/zerocoin/ParamGeneration.o \
 -    obj/zerocoin/Params.o \
 -    obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
 -    obj/zerocoin/SpendMetaData.o \
 -    obj/zerocoin/ZeroTest.o
 +    obj/scrypt.o
  
  all: novacoind.exe
  
@@@ -101,23 -113,17 +101,23 @@@ els
  OBJS += obj/txdb-bdb.o
  endif
  
 -obj/%.o: %.cpp $(HEADERS)
 -      g++ -c $(CFLAGS) -o $@ $<
 -
 -obj/zerocoin/%.o: zerocoin/%.cpp
 -      g++ -c $(CFLAGS) -o $@ $<
 +ifdef USE_ASM
 +OBJS += obj/scrypt-arm.o 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 $@ $<
 +else
 +OBJS += obj/scrypt-generic.o
 +
 +obj/scrypt-generic.o: scrypt-generic.c
 +      $(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
 +endif
 +
 +obj/%.o: %.cpp $(HEADERS)
 +      g++ -c $(CFLAGS) -o $@ $<
  
  novacoind.exe: $(OBJS:obj/%=obj/%)
        g++ $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
@@@ -125,5 -131,6 +125,5 @@@
  clean:
        -del /Q novacoind
        -del /Q obj\*
 -      -del /Q obj\zerocoin\*
  
  FORCE: