Skip to content

Commit 9bbbfe1

Browse files
committed
qt: Fix Windows/Darwin executable metadata
.rc's should be linked into the executable directly, not through a helper library.
1 parent c3d9666 commit 9bbbfe1

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/qt/Makefile.am

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -323,18 +323,16 @@ BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES)
323323
$(QT_MOC): $(PROTOBUF_H)
324324
$(QT_MOC_CPP): $(PROTOBUF_H)
325325

326-
if TARGET_DARWIN
327-
libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
328-
endif
329-
if TARGET_WINDOWS
330-
libbitcoinqt_a_SOURCES += $(BITCOIN_RC)
331-
endif
332-
#
333-
334326
# bitcoin-qt binary #
335327
bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
336328
-I$(top_srcdir)/src/qt/forms
337329
bitcoin_qt_SOURCES = bitcoin.cpp
330+
if TARGET_DARWIN
331+
bitcoin_qt_SOURCES += $(BITCOIN_MM)
332+
endif
333+
if TARGET_WINDOWS
334+
bitcoin_qt_SOURCES += $(BITCOIN_RC)
335+
endif
338336
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
339337
if ENABLE_WALLET
340338
bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)

0 commit comments

Comments
 (0)