qt: Fix Windows/Darwin executable metadata

.rc's should be linked into the executable directly,
not through a helper library.
This commit is contained in:
Wladimir J. van der Laan 2014-01-29 14:58:42 +01:00
parent c3d966690c
commit 9bbbfe188c

View File

@ -323,18 +323,16 @@ BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES)
$(QT_MOC): $(PROTOBUF_H) $(QT_MOC): $(PROTOBUF_H)
$(QT_MOC_CPP): $(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 binary #
bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms -I$(top_srcdir)/src/qt/forms
bitcoin_qt_SOURCES = bitcoin.cpp 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) bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
if ENABLE_WALLET if ENABLE_WALLET
bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)