From: marshmellow42 Date: Fri, 14 Apr 2017 14:31:00 +0000 (-0400) Subject: add uic make ui_overlays.h X-Git-Tag: v3.0.0~12^2~9 X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/27882d378be348c9bf68b741f993de0ea2001ab8 add uic make ui_overlays.h to 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 $^ > $@ diff --git a/client/ui/ui_overlays.h b/client/ui/ui_overlays.h index daa6192b..76003fc1 100644 --- a/client/ui/ui_overlays.h +++ b/client/ui/ui_overlays.h @@ -6,23 +6,23 @@ ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ -#ifndef UI_OVERLAYS_H -#define UI_OVERLAYS_H +#ifndef OVERLAYS_H +#define OVERLAYS_H #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE @@ -261,4 +261,4 @@ namespace Ui { QT_END_NAMESPACE -#endif // UI_OVERLAYS_H +#endif // OVERLAYS_H