X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/022c8791c14841d9c32f19b8b06ef6651bdcbd15..8b576d2d3125081ab24a970f6430044a19a4231d:/client/Makefile?ds=inline

diff --git a/client/Makefile b/client/Makefile
index 007bb4b6..8bbc0273 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -4,28 +4,29 @@ WINCC=c:\mingw\bin\gcc
 
 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)
 
+ifeq ($(shell echo ""),)
+
 ifeq ($(shell uname),Darwin)
-CXXFLAGS += -arch i386 -DQ_WS_MAC32
-CFLAGS += -arch i386
-QTLDLIBS += -arch i386
+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
 
 ifneq ($(QTLDLIBS),)
 QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI
-MOC = $(shell pkg-config --variable=moc_location QtCore)
+MOC ?= $(shell pkg-config --variable=moc_location QtCore)
 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 endif
 
-ifeq ($(shell echo ""),)
 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
 
-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)
@@ -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
 
-flasher: flasher.o usb.o
+flasher: flash.o flasher.o usb.o
 
 proxguiqt.moc.cpp: proxguiqt.h
 	$(MOC) -o$@ $^