Skip to content

Commit

Permalink
Try and identify uic and rcc automatically.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidgiven committed Aug 14, 2024
1 parent 8bbce6d commit cd27344
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ HOSTCXX = g++ -std=c++17
HOSTCFLAGS = -g -O3
HOSTLDFLAGS =

QTBINS = $(shell $(PKG_CONFIG) Qt5Core --variable=host_bins)
UIC = $(QTBINS)/uic
RCC = $(QTBINS)/rcc

REALOBJ = .obj
OBJ = $(REALOBJ)/$(BUILDTYPE)
DESTDIR ?=
Expand Down
4 changes: 2 additions & 2 deletions src/gui2/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def uic(self, name, src: Target = None, dest=None):
replaces=self,
ins=[src],
outs=[dest],
commands=["uic-qt5 -g cpp -o {outs[0]} {ins[0]}"],
commands=["$(UIC) -g cpp -o {outs[0]} {ins[0]}"],
label="UIC",
)

Expand All @@ -25,7 +25,7 @@ def uic(self, name, src: Target = None, dest=None):
name="resources_cc",
ins=["./resources.qrc"],
outs=["resources.cc"],
commands=["rcc-qt5 -g cpp --name resources -o {outs[0]} {ins[0]}"],
commands=["$(RCC) -g cpp --name resources -o {outs[0]} {ins[0]}"],
label="RCC",
)

Expand Down

0 comments on commit cd27344

Please sign in to comment.