new grid X offset calcs to fix some issues

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index cea981f90b29e15e6360aa3c7f01267b9c4ba049..826976126657f6daa5ea346a668e28621f651284 100644 (file)
--- 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,8 @@ 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 +183,10 @@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
+#cannot seem to get this to work accross qt versions...
+#ui/ui_overlays.h: ./ui/overlays.ui
+#      $(UIC) $^ > $@
+
 lualibs/usb_cmd.lua: ../include/usb_cmd.h
        awk -f usb_cmd_h2lua.awk $^ > $@