refactor flashing code into flash.h, so we can share it between platforms

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 8786701f2684b69a3a05b31acc89d3ab583cc188..8bbc0273cd35103cd347be8090d36b4be7d2a6b2 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -4,18 +4,20 @@ WINCC=c:\mingw\bin\gcc
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)

-CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
+CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3

 
 WINLIBS = -lgdi32 -lsetupapi
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 
 
 WINLIBS = -lgdi32 -lsetupapi
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 

+ifeq ($(shell echo ""),)
+

 ifeq ($(shell uname),Darwin)
 ifeq ($(shell uname),Darwin)

-CXXFLAGS += -DQ_WS_MAC32
-CFLAGS += 
-QTLDLIBS += 
+CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
+QTLDLIBS = -framework QtGui -framework QtCore
+MOC = moc

 endif
 endif

-QTLDLIBS=
+

 ifneq ($(QTLDLIBS),)
 QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI
 ifneq ($(QTLDLIBS),)
 QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI


@@ -25,7 +27,6 @@ else
 QTGUI = guidummy.o
 endif
 
 QTGUI = guidummy.o
 endif
 

-ifeq ($(shell echo ""),)

 RM = rm -f
 BINS = proxmark3 snooper cli flasher
 CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp
 RM = rm -f
 BINS = proxmark3 snooper cli flasher
 CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp


@@ -40,8 +41,8 @@ all: $(BINS)
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
 

-prox.exe: prox.c wingui.c command.c
-       $(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c $(WINLIBS)
+prox.exe: prox.c wingui.c command.c flash.c
+       $(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c flash.c $(WINLIBS)

        
 proxmark3: LDLIBS+=$(QTLDLIBS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
        
 proxmark3: LDLIBS+=$(QTLDLIBS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)


@@ -52,7 +53,7 @@ snooper: snooper.o gui.o command.o usb.o guidummy.o
 
 cli: cli.o gui.o command.o usb.o guidummy.o
 
 
 cli: cli.o gui.o command.o usb.o guidummy.o
 

-flasher: flasher.o usb.o
+flasher: flash.o flasher.o usb.o

 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^