aboutsummaryrefslogtreecommitdiff
path: root/makefile.unix
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2009-12-11 16:49:21 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2009-12-11 16:49:21 +0000
commit4ea3f3da1a0c00ea74e85c31a22ea94d18bbdf06 (patch)
tree4f9bb0b8598035b704a8abe08a292e8465e7c1c6 /makefile.unix
parentb075bbf9862df41cdf5265026ba787b7d0fecb07 (diff)
downloadbitcoin-4ea3f3da1a0c00ea74e85c31a22ea94d18bbdf06.tar.xz
retry IRC if name in use,
resize to fit ubuntu's giant default font, scroll debug.log, pause gen during initial block download git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@44 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'makefile.unix')
-rw-r--r--makefile.unix35
1 files changed, 19 insertions, 16 deletions
diff --git a/makefile.unix b/makefile.unix
index c0d0ee1d00..b9826d6ccb 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -22,13 +22,16 @@ INCLUDEPATHS= \
LIBPATHS= \
-L"/usr/lib" \
- -L"/usr/local/lib" \
+ -L"/usr/local/lib"
LIBS= \
- -Wl,-Bstatic -l boost_system -l boost_filesystem -Wl,-Bdynamic \
- -Wl,-Bstatic -l db_cxx -l wx_gtk2$(D)-2.8 -Wl,-Bdynamic \
- -l crypto \
- -l gtk-x11-2.0 -l gthread-2.0 -l SM
+ -Wl,-Bstatic \
+ -l boost_system -l boost_filesystem \
+ -l db_cxx \
+ -l wx_gtk2$(D)-2.8 \
+ -Wl,-Bdynamic \
+ -l crypto \
+ -l gtk-x11-2.0 -l gthread-2.0 -l SM
WXDEFS=-D__WXGTK__ -DNOPCH
CFLAGS=-O0 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
@@ -42,41 +45,41 @@ all: bitcoin
headers.h.gch: headers.h $(HEADERS) net.h irc.h market.h uibase.h ui.h
g++ -c $(CFLAGS) -o $@ $<
-obj/util.o: util.cpp $(HEADERS)
+obj/util.o: util.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<
-obj/script.o: script.cpp $(HEADERS)
+obj/script.o: script.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<
-obj/db.o: db.cpp $(HEADERS) market.h
+obj/db.o: db.cpp $(HEADERS) market.h
g++ -c $(CFLAGS) -o $@ $<
-obj/net.o: net.cpp $(HEADERS) net.h
+obj/net.o: net.cpp $(HEADERS) net.h
g++ -c $(CFLAGS) -o $@ $<
-obj/main.o: main.cpp $(HEADERS) net.h market.h sha.h
+obj/main.o: main.cpp $(HEADERS) net.h market.h sha.h
g++ -c $(CFLAGS) -o $@ $<
-obj/market.o: market.cpp $(HEADERS) market.h
+obj/market.o: market.cpp $(HEADERS) market.h
g++ -c $(CFLAGS) -o $@ $<
-obj/ui.o: ui.cpp $(HEADERS) net.h uibase.h ui.h market.h
+obj/ui.o: ui.cpp $(HEADERS) net.h uibase.h ui.h market.h
g++ -c $(CFLAGS) -o $@ $<
-obj/uibase.o: uibase.cpp uibase.h
+obj/uibase.o: uibase.cpp uibase.h
g++ -c $(CFLAGS) -o $@ $<
-obj/sha.o: sha.cpp sha.h
+obj/sha.o: sha.cpp sha.h
g++ -c $(CFLAGS) -O3 -o $@ $<
-obj/irc.o: irc.cpp $(HEADERS)
+obj/irc.o: irc.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<
OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
- obj/ui.o obj/uibase.o obj/sha.o obj/irc.o
+ obj/ui.o obj/uibase.o obj/sha.o obj/irc.o
bitcoin: headers.h.gch $(OBJS)
g++ $(CFLAGS) -o $@ $(LIBPATHS) $(OBJS) $(LIBS)