diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-29 14:58:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-29 15:05:42 +0100 |
| commit | 9bbbfe188c430ce078ca5f4d13885c68b35351f5 (patch) | |
| tree | 99aa343916e3511ee56d70c550595d6f130af40e /src | |
| parent | c3d966690c8719f474532392c0fbe7db9c700763 (diff) | |
| download | bitcoin-9bbbfe188c430ce078ca5f4d13885c68b35351f5.tar.xz | |
qt: Fix Windows/Darwin executable metadata
.rc's should be linked into the executable directly,
not through a helper library.
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index bb95c934f1..7de47291cc 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -323,18 +323,16 @@ BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES) $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) -if TARGET_DARWIN - libbitcoinqt_a_SOURCES += $(BITCOIN_MM) -endif -if TARGET_WINDOWS - libbitcoinqt_a_SOURCES += $(BITCOIN_RC) -endif -# - # bitcoin-qt binary # bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ -I$(top_srcdir)/src/qt/forms bitcoin_qt_SOURCES = bitcoin.cpp +if TARGET_DARWIN + bitcoin_qt_SOURCES += $(BITCOIN_MM) +endif +if TARGET_WINDOWS + bitcoin_qt_SOURCES += $(BITCOIN_RC) +endif bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) |