Skip to content

Commit 8b762bb

Browse files
IamLupoIamLupo
authored
Merge pull request #78 from IamLupo/master
Version 2.0.0.5
2 parents 69775b1 + d588579 commit 8b762bb

81 files changed

Lines changed: 248 additions & 198 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DigitalNote_config.pri‎

Lines changed: 90 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,101 @@
1+
## Version
12
DIGITALNOTE_VERSION_MAJOR = 2
23
DIGITALNOTE_VERSION_MINOR = 0
34
DIGITALNOTE_VERSION_REVISION = 0
4-
DIGITALNOTE_VERSION_BUILD = 4
5+
DIGITALNOTE_VERSION_BUILD = 5
56

6-
DIGITALNOTE_LIB_LEVELDB_DIR = $${DIGITALNOTE_PATH}/src/leveldb
7-
DIGITALNOTE_LIB_LEVELDB_NEW_DIR = $${DIGITALNOTE_PATH}/src/leveldb-2.11
8-
DIGITALNOTE_LIB_SECP256K1_DIR = $${DIGITALNOTE_PATH}/src/secp256k1
7+
## Leveldb library
8+
DIGITALNOTE_LEVELDB_PATH = $${DIGITALNOTE_PATH}/src/leveldb
9+
DIGITALNOTE_LEVELDB_INCLUDE_PATH = $${DIGITALNOTE_PATH}/src/leveldb/include
10+
DIGITALNOTE_LEVELDB_HELPERS_PATH = $${DIGITALNOTE_PATH}/src/leveldb/helpers
11+
DIGITALNOTE_LEVELDB_LIB_PATH = $${DIGITALNOTE_PATH}/src/leveldb
12+
13+
## Leveldb 2.11 library
14+
DIGITALNOTE_LEVELDB_2_11_PATH = $${DIGITALNOTE_PATH}/src/leveldb-2.11
15+
DIGITALNOTE_LEVELDB_2_11_INCLUDE_PATH = $${DIGITALNOTE_PATH}/src/leveldb-2.11/include
16+
DIGITALNOTE_LEVELDB_2_11_HELPERS_PATH = $${DIGITALNOTE_PATH}/src/leveldb-2.11/helpers
17+
DIGITALNOTE_LEVELDB_2_11_LIB_PATH = $${DIGITALNOTE_PATH}/src/leveldb-2.11/build
18+
19+
## Secp256K1 library
20+
DIGITALNOTE_SECP256K1_PATH = $${DIGITALNOTE_PATH}/src/secp256k1
21+
DIGITALNOTE_SECP256K1_INCLUDE_PATH = $${DIGITALNOTE_PATH}/src/secp256k1/include
22+
DIGITALNOTE_SECP256K1_LIB_PATH = $${DIGITALNOTE_PATH}/src/secp256k1/.libs
923

1024
win32 {
11-
## Config your lib directory names
12-
DIGITALNOTE_LIB_BOOST_DIR = $${DIGITALNOTE_PATH}/../libs/boost_1_75_0
13-
DIGITALNOTE_LIB_BOOST_SUFFIX = -mgw7-mt-d-x64-1_75
14-
DIGITALNOTE_LIB_OPENSSL_DIR = $${DIGITALNOTE_PATH}/../libs/openssl-1.0.2u
15-
DIGITALNOTE_LIB_BDB_DIR = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC
16-
DIGITALNOTE_LIB_EVENT_DIR = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.11-stable
17-
DIGITALNOTE_LIB_GMP_DIR = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1
18-
DIGITALNOTE_LIB_MINIUPNP_DIR = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.1
19-
DIGITALNOTE_LIB_QRENCODE_DIR = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1
25+
## Boost
26+
DIGITALNOTE_BOOST_PATH = $${DIGITALNOTE_PATH}/../libs/boost_1_75_0
27+
DIGITALNOTE_BOOST_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/boost_1_75_0
28+
DIGITALNOTE_BOOST_LIB_PATH = $${DIGITALNOTE_PATH}/../libs/boost_1_75_0/stage/lib
29+
DIGITALNOTE_BOOST_SUFFIX = -mgw7-mt-d-x64-1_75
30+
31+
## OpenSSL library
32+
DIGITALNOTE_OPENSSL_PATH = $${DIGITALNOTE_PATH}/../libs/openssl-1.0.2u
33+
DIGITALNOTE_OPENSSL_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/openssl-1.0.2u/include
34+
DIGITALNOTE_OPENSSL_LIB_PATH = $${DIGITALNOTE_PATH}/../libs/openssl-1.0.2u
35+
36+
## Berkeley db library
37+
DIGITALNOTE_BDB_PATH = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC
38+
DIGITALNOTE_BDB_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC/build_unix
39+
DIGITALNOTE_BDB_LIB_PATH = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC/build_unix
40+
41+
## Event library
42+
DIGITALNOTE_EVENT_PATH = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.11-stable
43+
DIGITALNOTE_EVENT_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.11-stable/include
44+
DIGITALNOTE_EVENT_LIB_PATH = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.11-stable/.libs
45+
46+
## GMP library
47+
DIGITALNOTE_GMP_PATH = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1
48+
DIGITALNOTE_GMP_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1
49+
DIGITALNOTE_GMP_LIB_PATH = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1/.libs
50+
51+
## Miniupnp library
52+
DIGITALNOTE_MINIUPNP_PATH = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.1
53+
DIGITALNOTE_MINIUPNP_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.1/../
54+
DIGITALNOTE_MINIUPNP_LIB_PATH = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.1
55+
56+
## QREncode library
57+
DIGITALNOTE_QRENCODE_PATH = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1
58+
DIGITALNOTE_QRENCODE_INCLUDE_PATH = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1
59+
DIGITALNOTE_QRENCODE_LIB_PATH = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1/.libs
2060
}
2161

2262
macx {
23-
DIGITALNOTE_LIB_BOOST_DIR = /usr/local/Cellar/boost/1.76.0
24-
DIGITALNOTE_LIB_BOOST_SUFFIX = -mt
25-
DIGITALNOTE_LIB_OPENSSL_DIR = /usr/local/Cellar/openssl@1.1/1.1.1k
26-
DIGITALNOTE_LIB_BDB_DIR = /usr/local/Cellar/berkeley-db@6.2.32
27-
DIGITALNOTE_LIB_BDB_SUFFIX = -6.2
28-
DIGITALNOTE_LIB_EVENT_DIR = /usr/local
29-
DIGITALNOTE_LIB_GMP_DIR = /usr/local
30-
DIGITALNOTE_LIB_MINIUPNP_DIR = /usr/local/Cellar/miniupnpc/2.2.2
31-
DIGITALNOTE_LIB_QRENCODE_DIR = /usr/local
32-
3363
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
64+
65+
## Boost
66+
DIGITALNOTE_BOOST_PATH = /usr/local/Cellar/boost/1.76.0
67+
DIGITALNOTE_BOOST_INCLUDE_PATH = /usr/local/Cellar/boost/1.76.0/include
68+
DIGITALNOTE_BOOST_LIB_PATH = /usr/local/Cellar/boost/1.76.0/lib
69+
DIGITALNOTE_BOOST_SUFFIX = -mt
70+
71+
## OpenSSL library
72+
DIGITALNOTE_OPENSSL_PATH = /usr/local/Cellar/openssl@1.1/1.1.1k
73+
DIGITALNOTE_OPENSSL_INCLUDE_PATH = /usr/local/Cellar/openssl@1.1/1.1.1k/include
74+
DIGITALNOTE_OPENSSL_LIB_PATH = /usr/local/Cellar/openssl@1.1/1.1.1k/lib
75+
76+
## Berkeley db library
77+
DIGITALNOTE_BDB_PATH = /usr/local/Cellar/berkeley-db@6.2.32
78+
DIGITALNOTE_BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db@6.2.32/include
79+
DIGITALNOTE_BDB_LIB_PATH = /usr/local/Cellar/berkeley-db@6.2.32/lib
80+
DIGITALNOTE_LIB_BDB_SUFFIX = -6.2
81+
82+
## Event library
83+
DIGITALNOTE_EVENT_PATH = /usr/local
84+
DIGITALNOTE_EVENT_INCLUDE_PATH = /usr/local/include
85+
DIGITALNOTE_EVENT_LIB_PATH = /usr/local/lib
86+
87+
## GMP library
88+
DIGITALNOTE_GMP_PATH = /usr/local
89+
DIGITALNOTE_GMP_INCLUDE_PATH = /usr/local/include
90+
DIGITALNOTE_GMP_LIB_PATH = /usr/local/lib
91+
92+
## Miniupnp library
93+
DIGITALNOTE_MINIUPNP_PATH = /usr/local/Cellar/miniupnpc/2.2.2
94+
DIGITALNOTE_MINIUPNP_INCLUDE_PATH = /usr/local/Cellar/miniupnpc/2.2.2/include
95+
DIGITALNOTE_MINIUPNP_LIB_PATH = /usr/local/Cellar/miniupnpc/2.2.2/lib
96+
97+
## QREncode library
98+
DIGITALNOTE_QRENCODE_PATH = /usr/local
99+
DIGITALNOTE_QRENCODE_INCLUDE_PATH = /usr/local/include
100+
DIGITALNOTE_QRENCODE_LIB_PATH = /usr/local/lib
34101
}

‎include/app/qt_settings.pri‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ CONFIG += thread
44
CONFIG += widgets
55
CONFIG += openssl
66
CONFIG += static
7+
CONFIG += lrelease
8+
CONFIG -= embed_translations
79
CONFIG -= debug_and_release
810

911
CODECFORTR = UTF-8

‎include/libs/bdb.pri‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
win32 {
2-
exists($${DIGITALNOTE_LIB_BDB_DIR}/build_unix/libdb_cxx$${DIGITALNOTE_LIB_BDB_SUFFIX}.a) {
2+
exists($${DIGITALNOTE_BDB_LIB_PATH}/libdb_cxx$${DIGITALNOTE_LIB_BDB_SUFFIX}.a) {
33
message("found BerkeleyDB lib")
44
} else {
55
message("You need to compile lib BerkeleyDB yourself.")
6-
message("Also you need to configure the following variables:")
7-
message(" DIGITALNOTE_LIB_BDB_DIR = $${DOLLAR}$${DOLLAR}DIGITALNOTE_PATH/../libs/db-6.2.32.NC")
6+
message("Also you need to configure the paths in 'DigitalNote_config.pri'")
87
}
9-
10-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_BDB_DIR}/build_unix
11-
INCLUDEPATH += $${DIGITALNOTE_LIB_BDB_DIR}/build_unix
12-
DEPENDPATH += $${DIGITALNOTE_LIB_BDB_DIR}/build_unix
138
}
149

15-
macx {
16-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_BDB_DIR}/lib
17-
INCLUDEPATH += $${DIGITALNOTE_LIB_BDB_DIR}/include
18-
DEPENDPATH += $${DIGITALNOTE_LIB_BDB_DIR}/include
10+
win32|macx {
11+
QMAKE_LIBDIR += $${DIGITALNOTE_BDB_LIB_PATH}
12+
INCLUDEPATH += $${DIGITALNOTE_BDB_INCLUDE_PATH}
13+
DEPENDPATH += $${DIGITALNOTE_BDB_INCLUDE_PATH}
1914
}
2015

2116
LIBS += -ldb_cxx$${DIGITALNOTE_LIB_BDB_SUFFIX}

‎include/libs/boost.pri‎

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,49 @@
11
win32 {
22
FAIL = 0
33

4-
exists($${DIGITALNOTE_LIB_BOOST_DIR}/stage/lib/libboost_system$${DIGITALNOTE_LIB_BOOST_SUFFIX}.a) {
5-
message("found boost system lib")
6-
} else {
4+
!exists($${DIGITALNOTE_BOOST_LIB_PATH}/libboost_system$${DIGITALNOTE_BOOST_SUFFIX}.a) {
75
FAIL = 1
86
}
97

10-
exists($${DIGITALNOTE_LIB_BOOST_DIR}/stage/lib/libboost_filesystem$${DIGITALNOTE_LIB_BOOST_SUFFIX}.a) {
11-
message("found boost filesystem lib")
12-
} else {
8+
!exists($${DIGITALNOTE_BOOST_LIB_PATH}/libboost_filesystem$${DIGITALNOTE_BOOST_SUFFIX}.a) {
139
FAIL = 1
1410
}
1511

16-
exists($${DIGITALNOTE_LIB_BOOST_DIR}/stage/lib/libboost_program_options$${DIGITALNOTE_LIB_BOOST_SUFFIX}.a) {
17-
message("found boost program options lib")
18-
} else {
12+
!exists($${DIGITALNOTE_BOOST_LIB_PATH}/libboost_program_options$${DIGITALNOTE_BOOST_SUFFIX}.a) {
1913
FAIL = 1
2014
}
2115

22-
exists($${DIGITALNOTE_LIB_BOOST_DIR}/stage/lib/libboost_thread$${DIGITALNOTE_LIB_BOOST_SUFFIX}.a) {
23-
message("found boost thread lib")
24-
} else {
16+
!exists($${DIGITALNOTE_BOOST_LIB_PATH}/libboost_thread$${DIGITALNOTE_BOOST_SUFFIX}.a) {
2517
FAIL = 1
2618
}
2719

28-
exists($${DIGITALNOTE_LIB_BOOST_DIR}/stage/lib/libboost_chrono$${DIGITALNOTE_LIB_BOOST_SUFFIX}.a) {
29-
message("found boost chrono lib")
30-
} else {
20+
!exists($${DIGITALNOTE_BOOST_LIB_PATH}/libboost_chrono$${DIGITALNOTE_BOOST_SUFFIX}.a) {
3121
FAIL = 1
3222
}
3323

34-
contains(FAIL, 1) {
24+
contains(FAIL, 0) {
25+
message("found boost filesystem lib")
26+
message("found boost program options lib")
27+
message("found boost thread lib")
28+
message("found boost system lib")
29+
message("found boost chrono lib")
30+
} else {
3531
message("You need to compile boost yourself.")
36-
message("Also you need to configure the following variables:")
37-
message(" DIGITALNOTE_LIB_DIR = $${DOLLAR}$${DOLLAR}DIGITALNOTE_PATH/../libs")
38-
message(" DIGITALNOTE_LIB_BOOST_NAME = boost_1_75_0")
39-
message(" DIGITALNOTE_LIB_BOOST_SUFFIX = -mgw7-mt-d-x64-1_75")
32+
message("Also you need to configure the paths in 'DigitalNote_config.pri'")
4033
}
41-
42-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_BOOST_DIR}/stage/lib
43-
INCLUDEPATH += $${DIGITALNOTE_LIB_BOOST_DIR}
44-
DEPENDPATH += $${DIGITALNOTE_LIB_BOOST_DIR}
4534
}
4635

47-
macx {
48-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_BOOST_DIR}/lib
49-
INCLUDEPATH += $${DIGITALNOTE_LIB_BOOST_DIR}/include
50-
DEPENDPATH += $${DIGITALNOTE_LIB_BOOST_DIR}/include
36+
win32|macx {
37+
QMAKE_LIBDIR += $${DIGITALNOTE_BOOST_LIB_PATH}
38+
INCLUDEPATH += $${DIGITALNOTE_BOOST_INCLUDE_PATH}
39+
DEPENDPATH += $${DIGITALNOTE_BOOST_INCLUDE_PATH}
5140
}
5241

53-
LIBS += -lboost_system$${DIGITALNOTE_LIB_BOOST_SUFFIX}
54-
LIBS += -lboost_filesystem$${DIGITALNOTE_LIB_BOOST_SUFFIX}
55-
LIBS += -lboost_program_options$${DIGITALNOTE_LIB_BOOST_SUFFIX}
56-
LIBS += -lboost_thread$${DIGITALNOTE_LIB_BOOST_SUFFIX}
57-
LIBS += -lboost_chrono$${DIGITALNOTE_LIB_BOOST_SUFFIX}
42+
LIBS += -lboost_system$${DIGITALNOTE_BOOST_SUFFIX}
43+
LIBS += -lboost_filesystem$${DIGITALNOTE_BOOST_SUFFIX}
44+
LIBS += -lboost_program_options$${DIGITALNOTE_BOOST_SUFFIX}
45+
LIBS += -lboost_thread$${DIGITALNOTE_BOOST_SUFFIX}
46+
LIBS += -lboost_chrono$${DIGITALNOTE_BOOST_SUFFIX}
5847

5948
DEFINES += BOOST_THREAD_USE_LIB
6049
DEFINES += BOOST_SPIRIT_THREADSAFE

‎include/libs/event.pri‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
win32 {
2-
exists($${DIGITALNOTE_LIB_EVENT_DIR}/.libs/libevent.a) {
2+
exists($${DIGITALNOTE_EVENT_PATH}/.libs/libevent.a) {
33
message("found event lib")
44
} else {
55
message("You need to compile lib event yourself.")
6-
message("Also you need to configure the following variables:")
7-
message(" DIGITALNOTE_LIB_GMP_DIR = $${DOLLAR}$${DOLLAR}DIGITALNOTE_PATH/../libs/libevent-2.1.11-stable")
6+
message("Also you need to configure the paths in 'DigitalNote_config.pri'")
87
}
9-
10-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_EVENT_DIR}/.libs
11-
INCLUDEPATH += $${DIGITALNOTE_LIB_EVENT_DIR}/include
12-
DEPENDPATH += $${DIGITALNOTE_LIB_EVENT_DIR}/include
138
}
149

15-
macx {
16-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_EVENT_DIR}/lib
17-
INCLUDEPATH += $${DIGITALNOTE_LIB_EVENT_DIR}/include
18-
DEPENDPATH += $${DIGITALNOTE_LIB_EVENT_DIR}/include
10+
win32|macx {
11+
QMAKE_LIBDIR += $${DIGITALNOTE_EVENT_LIB_PATH}
12+
INCLUDEPATH += $${DIGITALNOTE_EVENT_INCLUDE_PATH}
13+
DEPENDPATH += $${DIGITALNOTE_EVENT_INCLUDE_PATH}
1914
}
2015

2116
LIBS += -levent

‎include/libs/gmp.pri‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
win32 {
2-
exists($${DIGITALNOTE_LIB_GMP_DIR}/.libs/libgmp.a) {
2+
exists($${DIGITALNOTE_GMP_PATH}/.libs/libgmp.a) {
33
message("found gmp lib")
44
} else {
55
message("You need to compile leveldb yourself with msys2.")
6-
message("Also you need to configure the following variables:")
7-
message(" DIGITALNOTE_LIB_GMP_DIR = $${DOLLAR}$${DOLLAR}DIGITALNOTE_PATH/../libs/gmp-6.2.1")
6+
message("Also you need to configure the paths in 'DigitalNote_config.pri'")
87
}
9-
10-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_GMP_DIR}/.libs
11-
INCLUDEPATH += $${DIGITALNOTE_LIB_GMP_DIR}
12-
DEPENDPATH += $${DIGITALNOTE_LIB_GMP_DIR}
138
}
149

15-
macx {
16-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_GMP_DIR}/lib
17-
INCLUDEPATH += $${DIGITALNOTE_LIB_GMP_DIR}/include
18-
DEPENDPATH += $${DIGITALNOTE_LIB_GMP_DIR}/include
10+
win32|macx {
11+
QMAKE_LIBDIR += $${DIGITALNOTE_GMP_LIB_PATH}
12+
INCLUDEPATH += $${DIGITALNOTE_GMP_INCLUDE_PATH}
13+
DEPENDPATH += $${DIGITALNOTE_GMP_INCLUDE_PATH}
1914
}
2015

2116
LIBS += -lgmp

‎include/libs/leveldb-2.11.pri‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
!win32 {
22
COMPILE_LEVELDB = 0
33

4-
exists($${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/build/libleveldb.a) {
4+
exists($${DIGITALNOTE_LEVELDB_2_11_LIB_PATH}/libleveldb.a) {
55
message("found leveldb lib")
66
} else {
77
COMPILE_LEVELDB = 1
88
}
99

1010
contains(COMPILE_LEVELDB, 1) {
1111
# we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
12-
extra_leveldb.commands = cd $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}; mkdir -p build && cd build; cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build .
13-
extra_leveldb.target = $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/build/libleveldb.a
12+
extra_leveldb.commands = cd $${DIGITALNOTE_LEVELDB_2_11_PATH}; mkdir -p build && cd build; cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build .
13+
extra_leveldb.target = $${DIGITALNOTE_LEVELDB_2_11_LIB_PATH}/libleveldb.a
1414
extra_leveldb.depends = FORCE
1515

16-
PRE_TARGETDEPS += $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/build/libleveldb.a
16+
PRE_TARGETDEPS += $${DIGITALNOTE_LEVELDB_2_11_LIB_PATH}/libleveldb.a
1717
QMAKE_EXTRA_TARGETS += extra_leveldb
1818

1919
# Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
@@ -22,18 +22,18 @@
2222
}
2323

2424
win32 {
25-
exists($${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/build/libleveldb.a) {
25+
exists($${DIGITALNOTE_LEVELDB_2_11_LIB_PATH}/libleveldb.a) {
2626
message("found leveldb lib")
2727
} else {
2828
message("You need to compile leveldb yourself with msys2.")
2929
}
3030
}
3131

32-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/build
32+
QMAKE_LIBDIR += $${DIGITALNOTE_LEVELDB_2_11_LIB_PATH}
3333

34-
INCLUDEPATH += $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/include
35-
DEPENDPATH += $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/include
36-
INCLUDEPATH += $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/helpers
37-
DEPENDPATH += $${DIGITALNOTE_LIB_LEVELDB_NEW_DIR}/helpers
34+
INCLUDEPATH += $${DIGITALNOTE_LEVELDB_2_11_INCLUDE_PATH}
35+
DEPENDPATH += $${DIGITALNOTE_LEVELDB_2_11_INCLUDE_PATH}
36+
INCLUDEPATH += $${DIGITALNOTE_LEVELDB_2_11_HELPERS_PATH}
37+
DEPENDPATH += $${DIGITALNOTE_LEVELDB_2_11_HELPERS_PATH}
3838

3939
LIBS += -lleveldb

‎include/libs/leveldb.pri‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
COMPILE_LEVELDB = 0
22

3-
exists($${DIGITALNOTE_LIB_LEVELDB_DIR}/libleveldb.a) : exists($${DIGITALNOTE_LIB_LEVELDB_DIR}/libmemenv.a) {
3+
exists($${DIGITALNOTE_LEVELDB_LIB_PATH}/libleveldb.a) : exists($${DIGITALNOTE_LEVELDB_LIB_PATH}/libmemenv.a) {
44
message("found leveldb lib")
55
message("found memenv lib")
66
} else {
@@ -13,23 +13,23 @@ exists($${DIGITALNOTE_LIB_LEVELDB_DIR}/libleveldb.a) : exists($${DIGITALNOTE_LIB
1313

1414
contains(COMPILE_LEVELDB, 1) {
1515
# we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
16-
extra_leveldb.commands = cd $${DIGITALNOTE_LIB_LEVELDB_DIR} && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) libleveldb.a libmemenv.a
17-
extra_leveldb.target = $${DIGITALNOTE_LIB_LEVELDB_DIR}/libleveldb.a
16+
extra_leveldb.commands = cd $${DIGITALNOTE_LEVELDB_PATH} && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) libleveldb.a libmemenv.a
17+
extra_leveldb.target = $${DIGITALNOTE_LEVELDB_LIB_PATH}/libleveldb.a
1818
extra_leveldb.depends = FORCE
1919

20-
PRE_TARGETDEPS += $${DIGITALNOTE_LIB_LEVELDB_DIR}/libleveldb.a
20+
PRE_TARGETDEPS += $${DIGITALNOTE_LEVELDB_LIB_PATH}/libleveldb.a
2121
QMAKE_EXTRA_TARGETS += extra_leveldb
2222

2323
# Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
24-
QMAKE_CLEAN += $${DIGITALNOTE_LIB_LEVELDB_DIR}/libleveldb.a; cd $${DIGITALNOTE_LIB_LEVELDB_DIR}; $(MAKE) clean
24+
QMAKE_CLEAN += $${DIGITALNOTE_LEVELDB_LIB_PATH}/libleveldb.a; cd $${DIGITALNOTE_LEVELDB_LIB_PATH}; $(MAKE) clean
2525
}
2626

27-
QMAKE_LIBDIR += $${DIGITALNOTE_LIB_LEVELDB_DIR}
27+
QMAKE_LIBDIR += $${DIGITALNOTE_LEVELDB_LIB_PATH}
2828

29-
INCLUDEPATH += $${DIGITALNOTE_LIB_LEVELDB_DIR}/include
30-
DEPENDPATH += $${DIGITALNOTE_LIB_LEVELDB_DIR}/include
31-
INCLUDEPATH += $${DIGITALNOTE_LIB_LEVELDB_DIR}/helpers
32-
DEPENDPATH += $${DIGITALNOTE_LIB_LEVELDB_DIR}/helpers
29+
INCLUDEPATH += $${DIGITALNOTE_LEVELDB_INCLUDE_PATH}
30+
DEPENDPATH += $${DIGITALNOTE_LEVELDB_INCLUDE_PATH}
31+
INCLUDEPATH += $${DIGITALNOTE_LEVELDB_2_11_HELPERS_PATH}
32+
DEPENDPATH += $${DIGITALNOTE_LEVELDB_2_11_HELPERS_PATH}
3333

3434
LIBS += -lleveldb
3535
LIBS += -lmemenv

0 commit comments

Comments
 (0)