Skip to content

Commit

Permalink
Merge pull request #15 from noise23/master
Browse files Browse the repository at this point in the history
Add missing link to gamecredits.qss to qt/Makefile.am
  • Loading branch information
noise23 committed Mar 14, 2018
2 parents 17f3b92 + ff9622f commit 5ee089e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/qt/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ RES_IMAGES = \
res/images/about.png \
res/images/splash.png \
res/images/splash_testnet.png

RES_TEXT = res/text/gamecredits.qss

RES_MOVIES = $(wildcard res/movies/spinner-*.png)

Expand All @@ -324,7 +326,7 @@ BITCOIN_RC = res/bitcoin-qt-res.rc
libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
$(QT_QRC) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
$(QT_QRC) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_TEXT) $(RES_MOVIES)

nodist_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
$(PROTOBUF_H) $(QT_QRC_CPP)
Expand Down Expand Up @@ -370,7 +372,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/bitcoin_en.ts

$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_TEXT) $(RES_MOVIES) $(PROTOBUF_H)
@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
echo error: could not build $@
$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
Expand Down

0 comments on commit 5ee089e

Please sign in to comment.