diff options
| author | Matt Giuca <matt.giuca@gmail.com> | 2011-02-26 08:58:15 +1100 |
|---|---|---|
| committer | Matt Giuca <matt.giuca@gmail.com> | 2011-02-26 08:58:15 +1100 |
| commit | 8314b7f5e68007db1ffe12a0fe5d3204d4e79d2d (patch) | |
| tree | 1ac8224430dd8fedab19d20e91ba112434b39d84 | |
| parent | 32e94947dc39edc5cb601bd656011f4c8066aacb (diff) | |
makefile.unix: Removed redundant use of wx-config in DEFS (it was being included twice).
Also changed wx-config --cppflags to --cxxflags. I am not sure what the
difference is supposed to be, but --cppflags does not include -pthread.
| -rw-r--r-- | makefile.unix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makefile.unix b/makefile.unix index b36aa2c6a8..383de9aded 100644 --- a/makefile.unix +++ b/makefile.unix @@ -4,7 +4,7 @@ CXX=g++ -WXINCLUDEPATHS:=$(shell wx-config --cppflags) +WXINCLUDEPATHS:=$(shell wx-config --cxxflags) WXLIBS:=$(shell wx-config --libs) @@ -23,7 +23,7 @@ LIBS= \ -l z \ -l dl -DEFS:=$(shell wx-config --cxxflags) -DNOPCH -DFOURWAYSSE2 -DUSE_SSL +DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL DEBUGFLAGS=-g -D__WXDEBUG__ CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(WXINCLUDEPATHS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ |