From: marshmellow42 <marshmellowrf@gmail.com>
Date: Wed, 19 Apr 2017 03:41:38 +0000 (-0400)
Subject: fix makefile to allow make of overlays.ui
X-Git-Tag: v3.0.0~12^2~2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/3fc4596f2c56dbec9448685fa691333aa1ea5fb2?hp=3fd7fce4accbe4c5b59987fa4979ec46adcb459c

fix makefile to allow make of overlays.ui

to ui_overlays.h
add ui_overlays.h to .gitignore
should now compile to whatever qt version you have. (as long as it is
compatible with the overlays.ui file...)
---

diff --git a/.gitignore b/.gitignore
index d08c67b8..d41f7c1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 *.moc.cpp
 *.z
 version.c
+ui_overlays.h
 
 *.exe
 proxmark3
diff --git a/client/Makefile b/client/Makefile
index 82697612..ee2a25c0 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -162,10 +162,10 @@ 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 
-#./ui/ui_overlays.h
+CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
 
-all: lua_build $(BINS)
+# need to assign dependancies to build these first...
+all: ui/ui_overlays.h lua_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
@@ -183,9 +183,8 @@ 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) $^ > $@
+ui/ui_overlays.h: ui/overlays.ui
+	$(UIC) $^ > $@
 
 lualibs/usb_cmd.lua: ../include/usb_cmd.h
 	awk -f usb_cmd_h2lua.awk $^ > $@