From: alex Date: Sat, 31 Aug 2013 13:35:39 +0000 (+0400) Subject: Switch LevelDB back to default database engine X-Git-Tag: v0.4.4.4~2 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=508b8d7b106b53a0b8dea46d2e5a04661f3ea0e3 Switch LevelDB back to default database engine --- diff --git a/novacoin-qt.pro b/novacoin-qt.pro index e0b3e07..76631b7 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -90,7 +90,10 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets } -contains(USE_LEVELDB, 1) { +contains(USE_LEVELDB, -) { + message(Building without LevelDB) + SOURCES += src/txdb-bdb.cpp +} else { message(Building with LevelDB) DEFINES += USE_LEVELDB @@ -114,9 +117,6 @@ contains(USE_LEVELDB, 1) { QMAKE_EXTRA_TARGETS += genleveldb # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it. QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean -} else { - message(Building without LevelDB) - SOURCES += src/txdb-bdb.cpp } # regenerate src/build.h diff --git a/src/makefile.bsd b/src/makefile.bsd index d04faae..e54a80a 100644 --- a/src/makefile.bsd +++ b/src/makefile.bsd @@ -4,7 +4,7 @@ USE_UPNP:=0 USE_IPV6:=1 -USE_LEVELDB:=- +USE_LEVELDB:=1 LINK:=$(CXX) diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 7930937..ccd8fb2 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -6,7 +6,7 @@ DEPSDIR:=/usr/i586-mingw32msvc USE_UPNP:=0 USE_IPV6:=1 -USE_LEVELDB:=- +USE_LEVELDB:=1 INCLUDEPATHS= \ -I"$(CURDIR)" \ diff --git a/src/makefile.mingw b/src/makefile.mingw index e0fc9d4..369b5c5 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -4,7 +4,7 @@ USE_UPNP:=0 USE_IPV6:=1 -USE_LEVELDB:=- +USE_LEVELDB:=1 INCLUDEPATHS= \ -I"C:\boost-1.50.0-mgw" \ diff --git a/src/makefile.osx b/src/makefile.osx index 78c3148..9a3dc2e 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -21,7 +21,7 @@ LIBPATHS= \ USE_UPNP:=1 USE_IPV6:=1 -USE_LEVELDB:=- +USE_LEVELDB:=1 LIBS= -dead_strip