add uic make ui_overlays.h

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 3b4ce89e2f62b07791ac120b3d1901889632bc0d..2f8530934297564b86c4f610ec560c5265084012 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,29 +19,14 @@ 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
-LUAPLATFORM = generic
+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
 platform = $(shell uname)
 ifneq (,$(findstring MINGW,$(platform)))
-    CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-    ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
-        CXXFLAGS += -I$(QTDIR)/include/QtWidgets
-        QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets
-    else
-        QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-    endif
-    MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
 else
-       CXXFLAGS = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) -Wall -O4
-       QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
-       MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
-       ifeq ($(QTLDLIBS), )
-               CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
-               QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-               MOC = $(shell pkg-config --variable=moc_location QtCore)
-       endif
        ifeq ($(platform),Darwin)
                LUAPLATFORM = macosx
        else
@@ -51,7 +36,34 @@ else
        endif
 endif
 
-ifneq ($(QTLDLIBS),)
+# Check for correctly configured Qt5
+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
+       ifneq ($(QTDIR), )
+               QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+               QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+               ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
+                       QTINCLUDES += -I$(QTDIR)/include/QtWidgets
+                       QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
+               endif
+               MOC = $(QTDIR)/bin/moc
+               UIC = $(QTDIR)/bin/uic
+       endif
+endif
+
+
+ifneq ($(QTLDLIBS), )
     QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
 else
@@ -150,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)
 
@@ -170,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 $^ > $@
        
@@ -193,7 +208,7 @@ $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
 
 %.o: %.cpp
 $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
-       $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
+       $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
        $(POSTCOMPILE)