Fix QT CXXFLAGS/LDFLAGS

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 113223fb61e19f5609a17e4e3199952839b65c89..2d516ac7624207d1a392783eb1583fa704df80fa 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,29 +1,52 @@
+WINCC=c:\mingw\bin\gcc
+
 #COMMON_FLAGS = -m32
-LDLIBS = -L/usr/local/lib -lusb -lreadline -lpthread
+
+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)
 
+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 uname),Darwin)
+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 type moc-qt4 >/dev/null 2>&1 && echo moc-qt4 || echo moc)
+MOC ?= $(shell pkg-config --variable=moc_location QtCore)
 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 endif
 
-all: proxmark3 snooper cli flasher
+ifeq ($(shell echo ""),)
+RM = rm -f
+BINS = proxmark3 snooper cli flasher
+CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp
+else
+RM = del
+BINS = prox.exe
+CLEAN = prox.exe
+endif
+
+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)
+       
 proxmark3: LDLIBS+=$(QTLDLIBS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
 
-command.o: command.cpp translate.h
+command.o: command.c
 
 snooper: snooper.o gui.o command.o usb.o guidummy.o
 
@@ -35,6 +58,17 @@ proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 clean:
-       rm -f cli flasher proxmark3 snooper *.o *.moc.cpp
+       $(RM) $(CLEAN)
+
+# must be run as root
+install_kext: Info.plist
+       mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents
+       cp Info.plist /System/Library/Extensions/Proxmark3.kext/Contents
+       chown -R root:wheel /System/Library/Extensions/Proxmark3.kext
+       chmod 755 /System/Library/Extensions/Proxmark3.kext /System/Library/Extensions/Proxmark3.kext/Contents
+       chmod 644 /System/Library/Extensions/Proxmark3.kext/Contents/Info.plist
+       rm -rf /System/Library/Caches/com.apple.kext.caches
+       touch /System/Library/Extensions
+       @echo "*** You may need to reboot for the kext to take effect."
 
 .PHONY: all clean