Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
version 0.8.9.4
updated checkpoint, corrected splash screen +about dialog+ updated pro
file and mingw make file for open ssl 1.0.2a
  • Loading branch information
cinnamoncoin committed Apr 13, 2015
1 parent 0f12bed commit d2369ed
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 52 deletions.
76 changes: 33 additions & 43 deletions lithium-qt.pro
@@ -1,49 +1,43 @@
TEMPLATE = app
TARGET = Lithium-qt
macx:TARGET = "Lithium-Qt"
VERSION = 0.8.9.3
VERSION = 0.8.9.4
INCLUDEPATH += src src/json src/qt
QT += core gui network
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
CONFIG += thread
CONFIG += static

# for boost 1.37, add -mt to the boost libraries
# use: qmake BOOST_LIB_SUFFIX=-mt
# for boost thread win32 with _win32 sufix
# use: BOOST_THREAD_LIB_SUFFIX=_win32-...
# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8

# 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

# Start of Windows Path Uncomment and change if your paths are diffrent

windows:LIBS += -lshlwapi
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
LIBS += -lboost_system-mgw48-mt-s-1_55 -lboost_filesystem-mgw48-mt-s-1_55 -lboost_program_options-mgw48-mt-s-1_55 -lboost_thread-mgw48-mt-s-1_55
BOOST_LIB_SUFFIX=-mgw48-mt-s-1_55
windows:LIBS += -lws2_32 -lole32 -loleaut32 -luuid -lgdi32
LIBS += -lboost_system-mgw46-mt-sd-1_55 -lboost_filesystem-mgw46-mt-sd-1_55 -lboost_program_options-mgw46-mt-sd-1_55 -lboost_thread-mgw46-mt-sd-1_55
BOOST_LIB_SUFFIX=-mgw46-mt-sd-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-4.8.30.NC/build_unix
BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include
OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j
BDB_INCLUDE_PATH=c:/deps/db/build_unix
BDB_LIB_PATH=c:/deps/db/build_unix
OPENSSL_INCLUDE_PATH=c:/deps/openssl-1.0.2a/include
OPENSSL_LIB_PATH=c:/deps/openssl-1.0.2a
MINIUPNPC_LIB_SUFFIX=-miniupnpc
MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc
MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
MINIUPNPC_INCLUDE_PATH=C:/deps/deps/miniupnpc
MINIUPNPC_LIB_PATH=C:/deps/deps/miniupnpc
QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.12
# End of Windows Paths
LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.14
#QRENCODE_LIB_PATH=C:/deps/qr/.libs


OBJECTS_DIR = build
MOC_DIR = build
UI_DIR = build


# use: qmake "RELEASE=1"
contains(RELEASE, 1) {
# Mac: compile for maximum compatibility (10.5, 32-bit)
Expand All @@ -61,22 +55,17 @@ contains(RELEASE, 1) {
# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
QMAKE_CXXFLAGS *= -fstack-protector-all
QMAKE_LFLAGS *= -fstack-protector-all
#QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
#QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
# Exclude on Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
}
# for extra security (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific
#QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
QMAKE_CXXFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
#win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
# on Windows: enable GCC large address aware linker flag
#win32:QMAKE_LFLAGS *= -Wl,--large-address-aware
#win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
# i686-w64-mingw32
#win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++ -static
win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++
win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++ -static

# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
Expand All @@ -87,22 +76,21 @@ contains(USE_QRCODE, 1) {
}

# use: qmake "USE_UPNP=1" ( enabled by default; default)
# or: qmake "USE_UPNP=0" (disabled by default)
# or: qmake "USE_UPNP=-" (not supported)
# or: qmake "USE_UPNP=0" (disabled by default)
# or: qmake "USE_UPNP=-" (not supported)
# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support
contains(USE_UPNP, -) {
message(Building without UPNP support)
message(Building without UPNP support)
} else {
message(Building with UPNP support)
count(USE_UPNP, 0) {
USE_UPNP=1
}
DEFINES += USE_UPNP=$$USE_UPNP MINIUPNP_STATICLIB STATICLIB
INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
win32:LIBS += -liphlpapi
message(Building with UPNP support)
count(USE_UPNP, 0) {
USE_UPNP=1
}
DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
win32:LIBS += -liphlpapi
}

# use: qmake "USE_DBUS=1"
contains(USE_DBUS, 1) {
message(Building with DBUS (Freedesktop notifications) support)
Expand Down Expand Up @@ -138,7 +126,7 @@ LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
}
LIBS += -lshlwapi
genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
# genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
}
genleveldb.target = $$PWD/src/leveldb/libleveldb.a
genleveldb.depends = FORCE
Expand All @@ -159,6 +147,8 @@ QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) cl

QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector

macx:QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated

# Input
DEPENDPATH += src src/json src/qt
HEADERS += src/qt/bitcoingui.h \
Expand Down
14 changes: 9 additions & 5 deletions src/checkpoints.cpp
Expand Up @@ -37,20 +37,24 @@ namespace Checkpoints
( 0, uint256("0x000000fcf39055b547e94e610f1008b8046f942bbb730e8b6dfa6232931902db"))
( 13000, uint256("0x09f2b9ccb8024bb4eaf3d230945333d2b9418bbb0602d6de8d0f81cc5035136f"))
( 19021, uint256("0x050190c7720c393171514350353ec7ac070bf721e79f053e521e0ea64b223d91"))
( 26012, uint256("0x0384667174cf11623d727993781681f7d47e94a99d85c410d425c2522ba2d928"))
( 30019, uint256("0x0b3c9b8156ecb23c0a851ceea23b5b635ea460c04bb6f86dfe40b5a7e524d242"))
( 26012, uint256("0x0384667174cf11623d727993781681f7d47e94a99d85c410d425c2522ba2d928"))
( 30019, uint256("0x0b3c9b8156ecb23c0a851ceea23b5b635ea460c04bb6f86dfe40b5a7e524d242"))
( 84000, uint256("0x000b1002ef5d01182a42f341e1f2838dddb123b3ef5693476d882c123ee804cf"))

;



/////***{

//****

static const CCheckpointData data = {
&mapCheckpoints,
1417948509, // * UNIX timestamp of last checkpoint block
56629, // * total number of transactions between genesis and last checkpoint
1428505009, // * UNIX timestamp of last checkpoint block
166983, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
1800 // * estimated number of transactions per day after checkpoint
2800 // * estimated number of transactions per day after checkpoint
};

static MapCheckpoints mapCheckpointsTestnet =
Expand Down
4 changes: 2 additions & 2 deletions src/makefile.mingw
Expand Up @@ -29,14 +29,14 @@ INCLUDEPATHS= \
-I"c:/deps/boost_1_55_0" \
-I"c:/deps/db-4.8.30.NC/build_unix" \
-I"c:/deps/miniupnpc" \
-I"c:/deps/openssl-1.0.1j/include"
-I"c:/deps/openssl-1.0.2a/include"

LIBPATHS= \
-L"$(CURDIR)/leveldb" \
-L"c:/deps/boost_1_55_0/stage/lib" \
-L"c:/deps/db-4.8.30.NC/build_unix" \
-L"c:/deps/miniupnpc" \
-L"c:/deps/openssl-1.0.1j"
-L"c:/deps/openssl-1.0.2a"

LIBS= \
-l leveldb \
Expand Down
2 changes: 1 addition & 1 deletion src/qt/aboutdialog.cpp
Expand Up @@ -13,7 +13,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
// Set current copyright year
ui->copyrightLabel->setText(
tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers") + QString(",<br>") +
tr("Copyright") + QString(" &copy; 2015 ") + tr("The Lithium developers"));
tr("Copyright") + QString(" &copy; 2014-%1 ").arg(COPYRIGHT_YEAR) + tr("The Lithium developers"));
}

void AboutDialog::setModel(ClientModel *model)
Expand Down
2 changes: 1 addition & 1 deletion src/qt/splashscreen.cpp
Expand Up @@ -20,7 +20,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
QString titleText = QString(QApplication::applicationName()).replace(QString("-testnet"), QString(""), Qt::CaseSensitive); // cut of testnet, place it as single object further down
QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin developers"));
QString copyrightText2 = QChar(0xA9)+QString(" 20013 ") + QString(tr("The Lithium developers"));
QString copyrightText2 = QChar(0xA9)+QString(" 20014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Lithium developers"));
QString testnetAddText = QString(tr("[testnet]")); // define text to place as single text object

QString font = "Arial";
Expand Down

0 comments on commit d2369ed

Please sign in to comment.