@@ -168,10 +168,10 @@ BITCOIN_QT_H = \
168
168
qt/walletview.h \
169
169
qt/winshutdownmonitor.h
170
170
171
- RES_FONTS = \
171
+ QT_RES_FONTS = \
172
172
qt/res/fonts/RobotoMono-Bold.ttf
173
173
174
- RES_ICONS = \
174
+ QT_RES_ICONS = \
175
175
qt/res/icons/add.png \
176
176
qt/res/icons/address-book.png \
177
177
qt/res/icons/bitcoin.ico \
@@ -287,9 +287,9 @@ if ENABLE_WALLET
287
287
BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
288
288
endif # ENABLE_WALLET
289
289
290
- RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png)
290
+ QT_RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png)
291
291
292
- BITCOIN_RC = qt/res/bitcoin-qt-res.rc
292
+ BITCOIN_QT_RC = qt/res/bitcoin-qt-res.rc
293
293
294
294
BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -DQT_USE_QSTRINGBUILDER
295
295
@@ -299,7 +299,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
299
299
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
300
300
301
301
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
302
- $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_FONTS ) $(RES_ICONS ) $(RES_ANIMATION )
302
+ $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(QT_RES_FONTS ) $(QT_RES_ICONS ) $(QT_RES_ANIMATION )
303
303
if TARGET_DARWIN
304
304
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
305
305
endif
@@ -321,7 +321,7 @@ bitcoin_qt_cxxflags = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
321
321
322
322
bitcoin_qt_sources = qt/main.cpp
323
323
if TARGET_WINDOWS
324
- bitcoin_qt_sources += $(BITCOIN_RC )
324
+ bitcoin_qt_sources += $(BITCOIN_QT_RC )
325
325
endif
326
326
bitcoin_qt_ldadd = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
327
327
if ENABLE_WALLET
@@ -371,7 +371,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
371
371
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale --format-version 1 $(@D)/temp_$(<F) > $@
372
372
@rm $(@D)/temp_$(<F)
373
373
374
- $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_FONTS ) $(RES_ICONS ) $(RES_ANIMATION )
374
+ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(QT_RES_FONTS ) $(QT_RES_ICONS ) $(QT_RES_ANIMATION )
375
375
@test -f $(RCC)
376
376
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@
377
377
0 commit comments