Merge pull request #289 from patrickdk77/master

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 826976126657f6daa5ea346a668e28621f651284..3faa6f9378efda66d37f8f91b3f121d2f2dad033 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -20,7 +20,7 @@ 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 -O3
 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 -O3

-CXXFLAGS = -std=c++11 -fPIC -Wall -O3
+CXXFLAGS = -Wall -O3

 
 LUAPLATFORM = generic
 platform = $(shell uname)
 
 LUAPLATFORM = generic
 platform = $(shell uname)


@@ -42,11 +42,13 @@ 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), )
 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  
+# 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)
        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)

+else
+       CXXFLAGS += -std=c++11 -fPIC

 endif
 ifeq ($(QTINCLUDES), )
 # if both pkg-config commands failed, search in common places
 endif
 ifeq ($(QTINCLUDES), )
 # if both pkg-config commands failed, search in common places


@@ -56,6 +58,7 @@ ifeq ($(QTINCLUDES), )
                ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
                        QTINCLUDES += -I$(QTDIR)/include/QtWidgets
                        QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
                ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
                        QTINCLUDES += -I$(QTDIR)/include/QtWidgets
                        QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core

+                       CXXFLAGS += -std=c++11 -fPIC

                endif
                MOC = $(QTDIR)/bin/moc
                UIC = $(QTDIR)/bin/uic
                endif
                MOC = $(QTDIR)/bin/moc
                UIC = $(QTDIR)/bin/uic


@@ -162,10 +165,10 @@ ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 
 BINS = proxmark3 flasher fpga_compress
 WINBINS = $(patsubst %, %.exe, $(BINS))
 
 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
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress


@@ -183,9 +186,8 @@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 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 $^ > $@
 
 lualibs/usb_cmd.lua: ../include/usb_cmd.h
        awk -f usb_cmd_h2lua.awk $^ > $@