X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1a3c006469f38deb037cd8f0d79555f2f564d784..27882d378be348c9bf68b741f993de0ea2001ab8:/client/Makefile diff --git a/client/Makefile b/client/Makefile index cea981f9..2f853093 100644 --- a/client/Makefile +++ b/client/Makefile @@ -40,11 +40,13 @@ endif QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null) MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc +UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic ifeq ($(QTINCLUDES), ) # if Qt5 not found Check for correctly configured Qt4 QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) MOC = $(shell pkg-config --variable=moc_location QtCore) + UIC = $(shell pkg-config --variable=uic_location QtCore) endif ifeq ($(QTINCLUDES), ) # if both pkg-config commands failed, search in common places @@ -56,6 +58,7 @@ ifeq ($(QTINCLUDES), ) QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core endif MOC = $(QTDIR)/bin/moc + UIC = $(QTDIR)/bin/uic endif endif @@ -159,7 +162,7 @@ ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o) BINS = proxmark3 flasher fpga_compress WINBINS = $(patsubst %, %.exe, $(BINS)) -CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp +CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp ./ui/ui_overlays.h all: lua_build $(BINS) @@ -179,6 +182,9 @@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS) proxguiqt.moc.cpp: proxguiqt.h $(MOC) -o$@ $^ +ui/ui_overlays.h: ./ui/overlays.ui + $(UIC) $^ > $@ + lualibs/usb_cmd.lua: ../include/usb_cmd.h awk -f usb_cmd_h2lua.awk $^ > $@