projects
/
proxmark3-svn
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
775c4c4
)
fix client/Makefile
author
menshiyun
<men_shiyun@qq.com>
Sun, 25 Sep 2016 06:26:11 +0000
(14:26 +0800)
committer
menshiyun
<men_shiyun@qq.com>
Sun, 25 Sep 2016 06:26:11 +0000
(14:26 +0800)
client/Makefile
patch
|
blob
|
blame
|
history
diff --git
a/client/Makefile
b/client/Makefile
index 863f3c2c7eefffa1cf9ed1b74a5698cf8649bcd5..c704c6bae0d71c10ebf57f19a7c907ad54d28419 100644
(file)
--- a/
client/Makefile
+++ b/
client/Makefile
@@
-12,12
+12,7
@@
CXX=g++
VPATH = ../common ../zlib
OBJDIR = obj
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
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
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
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
LUALIB += -ldl
Impressum
,
Datenschutz