Skip to content

Commit 0b5d6f1

Browse files
author
Matt Corallo
committed
Add QR Code support to Win32 Gitian build.
1 parent 1194739 commit 0b5d6f1

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

bitcoin-qt.pro

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ macx:ICON = src/qt/res/icons/bitcoin.icns
283283
macx:TARGET = "Bitcoin-Qt"
284284

285285
# Set libraries and includes at end, to use platform-defined defaults if not overridden
286-
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH
287-
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,)
286+
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
287+
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
288288
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
289289
# -lgdi32 has to happen after -lcrypto (see #681)
290290
windows:LIBS += -lgdi32

contrib/gitian-descriptors/gitian-win32.yml

+21-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ files:
2121
- "openssl-1.0.0e.tar.gz"
2222
- "db-4.8.30.NC.tar.gz"
2323
- "miniupnpc-1.6.tar.gz"
24+
- "zlib-1.2.5.tar.gz"
25+
- "libpng-1.5.7.tar.gz"
26+
- "qrencode-3.2.0.tar.bz2"
2427
script: |
2528
#
2629
mkdir $HOME/qt
@@ -62,6 +65,23 @@ script: |
6265
cd ..
6366
mv miniupnpc-1.6 miniupnpc
6467
#
68+
tar xzf zlib-1.2.5.tar.gz
69+
cd zlib-1.2.5
70+
make -f win32/Makefile.gcc PREFIX=i586-mingw32msvc- $MAKEOPTS
71+
cd ..
72+
#
73+
tar xzf libpng-1.5.7.tar.gz
74+
cd libpng-1.5.7
75+
./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld LDFLAGS="-L../zlib-1.2.5/" CFLAGS="-I../zlib-1.2.5/"
76+
make $MAKEOPTS
77+
cd ..
78+
#
79+
tar xjf qrencode-3.2.0.tar.bz2
80+
cd qrencode-3.2.0
81+
./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld png_LIBS="../libpng-1.5.7/.libs/libpng15.a ../zlib-1.2.5/libz.a" png_CFLAGS="-I../libpng-1.5.7"
82+
make $MAKEOPTS
83+
cd ..
84+
#
6585
cd bitcoin
6686
mkdir -p $OUTDIR/src
6787
cp -a . $OUTDIR/src
@@ -71,7 +91,7 @@ script: |
7191
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
7292
export FAKETIME=$REFERENCE_DATETIME
7393
export TZ=UTC
74-
$HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross USE_SSL=1 MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.0e OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.0e/include INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin
94+
$HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross USE_SSL=1 MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.0e OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.0e/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin
7595
make $MAKEOPTS
7696
cp release/bitcoin-qt.exe $OUTDIR/
7797
#

0 commit comments

Comments
 (0)