X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3472ebe5285ecaaffba676db471e03f704da1c51..b62b5e2527e36cdbfda2e3d2a7ce8a46e45969e1:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index 2a2c7e49..ee2a25c0 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,7 +19,7 @@ OBJDIR = obj
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3
 CXXFLAGS = -std=c++11 -fPIC -Wall -O3
 
 LUAPLATFORM = generic
@@ -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,9 +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
+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
@@ -179,6 +183,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 $^ > $@