From: izsh@fail0verflow.com Date: Wed, 24 Feb 2010 19:33:29 +0000 (+0000) Subject: Fix QT compilation for Windows/MinGW and update the compilation instructions accordingly. X-Git-Tag: v1.0.0~326 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/8691f5b7bbe9138e9a4aa421da9a374536a8b556?hp=9cc7c4b4d13702122da3b7306391f411c030dc27 Fix QT compilation for Windows/MinGW and update the compilation instructions accordingly. --- diff --git a/COMPILING b/COMPILING index 118305fa..21782e2f 100644 --- a/COMPILING +++ b/COMPILING @@ -53,6 +53,13 @@ export DEVKITARM=/c/devkitPro/devkitARM 6 - Install Strawberry Perl [6] +7 - Setup a few variables + +In your shell from MSYS, make sure you set QTDIR to your QT installation: +export QTDIR=/c/QT/qt +And add its bin to your path as well: +export PATH=$PATH:$QTDIR/bin + Download links: [1] http://qt.nokia.com/downloads/sdk-windows-cpp diff --git a/client/Makefile b/client/Makefile index 4eae4bc7..b6d40c57 100644 --- a/client/Makefile +++ b/client/Makefile @@ -14,19 +14,26 @@ LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread LDFLAGS = $(COMMON_FLAGS) CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3 -CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3 -QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) +platform = $(shell uname) -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 +ifneq (,$(findstring MINGW,$(platform))) +CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui +QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4 MOC = moc +else ifeq ($(platform),Darwin) +CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Version/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers +QTLDLIBS = -framework QtGui -framework QtCore +MOC = moc +else +CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3 +QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) +MOC = $(shell pkg-config --variable=moc_location QtCore) 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