diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-04-12 14:22:12 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-04-12 14:22:12 -0400 |
| commit | 79706a8e48a043b9ca83216ba9cbb7413e81710d (patch) | |
| tree | 8da44bcaca6b7a3ce02c589957da284ac8adf9dd /makefile.unix | |
| parent | 2e8b33824f4bd76efd84837335eeb8a025787b4b (diff) | |
| parent | 8bb5edc1c9054d835ef79c9f1ab3e021b0693303 (diff) | |
| download | bitcoin-79706a8e48a043b9ca83216ba9cbb7413e81710d.tar.xz | |
Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'makefile.unix')
| -rw-r--r-- | makefile.unix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/makefile.unix b/makefile.unix index d306f746d3..61b925e3bc 100644 --- a/makefile.unix +++ b/makefile.unix @@ -8,6 +8,10 @@ WXINCLUDEPATHS=$(shell wx-config --cxxflags) WXLIBS=$(shell wx-config --libs) +USE_UPNP:=0 + +DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL + # for boost 1.37, add -mt to the boost libraries LIBS= \ -Wl,-Bstatic \ @@ -17,13 +21,20 @@ LIBS= \ -l boost_thread \ -l db_cxx \ -l ssl \ - -l crypto \ + -l crypto + +ifdef USE_UPNP + LIBS += -l miniupnpc + DEFS += -DUSE_UPNP=$(USE_UPNP) +endif + +LIBS+= \ -Wl,-Bdynamic \ -l gthread-2.0 \ -l z \ -l dl -DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL + DEBUGFLAGS=-g -D__WXDEBUG__ CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ |