From 62b1302c9729c198a18982fc6fde367d8ba7a541 Mon Sep 17 00:00:00 2001 From: "izsh@fail0verflow.com" Date: Sun, 21 Feb 2010 01:07:11 +0000 Subject: [PATCH] client/Makefile: Cosmestic changes. --- client/Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/client/Makefile b/client/Makefile index c4696464..e1a5c4f7 100644 --- a/client/Makefile +++ b/client/Makefile @@ -17,6 +17,21 @@ CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno 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 = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o +CFLAGS += -DHAVE_GUI +MOC ?= $(shell pkg-config --variable=moc_location QtCore) +LINK.o = $(LINK.cpp) +else +QTGUI = guidummy.o +endif + CMDSRCS = \ crc16.c \ iso14443crc.c \ @@ -39,21 +54,6 @@ CMDSRCS = \ CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o) -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 = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o -CFLAGS += -DHAVE_GUI -MOC ?= $(shell pkg-config --variable=moc_location QtCore) -LINK.o = $(LINK.cpp) -else -QTGUI = guidummy.o -endif - RM = rm -f BINS = proxmark3 snooper cli flasher CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp -- 2.39.5