Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 23:36:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix makefile to allow make of overlays.ui

Browse source 
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...)
This commit is contained in:
marshmellow42 2017-04-18 23:41:38 -04:00
parent 3fd7fce4ac
commit 3fc4596f2c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -15,6 +15,7 @@
*.moc.cpp *.moc.cpp
*.z *.z
version.c version.c
ui_overlays.h
*.exe *.exe
proxmark3 proxmark3

11
client/Makefile
View file

@ -162,10 +162,10 @@ ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
BINS = proxmark3 flasher fpga_compress BINS = proxmark3 flasher fpga_compress
WINBINS = $(patsubst %, %.exe, $(BINS)) 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
#./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: LDLIBS:=-static $(LDLIBS)
all-static: proxmark3 flasher fpga_compress all-static: proxmark3 flasher fpga_compress
@ -183,9 +183,8 @@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
proxguiqt.moc.cpp: proxguiqt.h proxguiqt.moc.cpp: proxguiqt.h
$(MOC) -o$@ $^ $(MOC) -o$@ $^
#cannot seem to get this to work accross qt versions... ui/ui_overlays.h: ui/overlays.ui
#ui/ui_overlays.h: ./ui/overlays.ui $(UIC) $^ > $@
# $(UIC) $^ > $@
lualibs/usb_cmd.lua: ../include/usb_cmd.h lualibs/usb_cmd.lua: ../include/usb_cmd.h
awk -f usb_cmd_h2lua.awk $^ > $@ awk -f usb_cmd_h2lua.awk $^ > $@