From 775c4c4a282900d14d4a612c9cb1435f8059d627 Mon Sep 17 00:00:00 2001 From: menshiyun Date: Sat, 24 Sep 2016 12:56:08 +0800 Subject: [PATCH 1/3] test-pr --- client/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/Makefile b/client/Makefile index cab4fddb..863f3c2c 100644 --- a/client/Makefile +++ b/client/Makefile @@ -12,7 +12,12 @@ CXX=g++ VPATH = ../common ../zlib OBJDIR = obj -LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ltermcap -lncurses +ifneq (,$(findstring MINGW,$(platform))) + LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm +else + LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ltermcap -lncurses +endif + LUALIB = ../liblua/liblua.a LDFLAGS = $(COMMON_FLAGS) CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 From 94e27a096143b68c4ec00b8cb2216f00811f48ab Mon Sep 17 00:00:00 2001 From: menshiyun Date: Sun, 25 Sep 2016 14:26:11 +0800 Subject: [PATCH 2/3] fix client/Makefile --- client/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/client/Makefile b/client/Makefile index 863f3c2c..c704c6ba 100644 --- a/client/Makefile +++ b/client/Makefile @@ -12,12 +12,7 @@ CXX=g++ VPATH = ../common ../zlib OBJDIR = obj -ifneq (,$(findstring MINGW,$(platform))) - LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -else - LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ltermcap -lncurses -endif - +LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm LUALIB = ../liblua/liblua.a LDFLAGS = $(COMMON_FLAGS) CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 @@ -39,6 +34,7 @@ else ifeq ($(platform),Darwin) MOC = $(shell pkg-config --variable=moc_location QtCore) LUAPLATFORM = macosx else + LDLIBS += -ltermcap -lncurses CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) LUALIB += -ldl From 5bac3d9b3cb3f262752ae2b7c0908b1ea6872087 Mon Sep 17 00:00:00 2001 From: menshiyun Date: Sun, 25 Sep 2016 14:32:06 +0800 Subject: [PATCH 3/3] fix client/Makefile --- client/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/Makefile b/client/Makefile index c704c6ba..6b8b84a3 100644 --- a/client/Makefile +++ b/client/Makefile @@ -34,10 +34,10 @@ else ifeq ($(platform),Darwin) MOC = $(shell pkg-config --variable=moc_location QtCore) LUAPLATFORM = macosx else - LDLIBS += -ltermcap -lncurses CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) LUALIB += -ldl + LDLIBS += -ltermcap -lncurses MOC = $(shell pkg-config --variable=moc_location QtCore) # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc