diff options
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-07-26 17:15:18 +0000 |
|---|---|---|
| committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-07-26 17:15:18 +0000 |
| commit | 793200e5e918a6e993ddf701967a8b6535a6828f (patch) | |
| tree | e983c5b11c032a309edb230f8694225aef478d98 /makefile.unix | |
| parent | 6966768a554575ca329fbcd4aad0d4f21c702f9a (diff) | |
| download | bitcoin-793200e5e918a6e993ddf701967a8b6535a6828f.tar.xz | |
bitcoind now compiles without wxWidgets or wxBase
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@112 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'makefile.unix')
| -rw-r--r-- | makefile.unix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/makefile.unix b/makefile.unix index cc5111bbbb..0b54962144 100644 --- a/makefile.unix +++ b/makefile.unix @@ -3,7 +3,6 @@ # file license.txt or http://www.opensource.org/licenses/mit-license.php.
-
INCLUDEPATHS= \
-I"/usr/include" \
-I"/usr/local/include/wx-2.9" \
@@ -21,27 +20,30 @@ WXLIBS= \ LIBS= \
-Wl,-Bstatic \
- -l boost_system -l boost_filesystem -l boost_program_options \
+ -l boost_system \
+ -l boost_filesystem \
+ -l boost_program_options \
+ -l boost_thread \
-l db_cxx \
-l crypto \
-Wl,-Bdynamic \
-l gthread-2.0
-WXDEFS=-D__WXGTK__ -DNOPCH
+DEFS=-D__WXGTK__ -DNOPCH
DEBUGFLAGS=-g -D__WXDEBUG__
-CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
+CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
- script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h init.h sha.h
+ script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h sha.h
all: bitcoin
headers.h.gch: headers.h $(HEADERS)
- g++ -c $(CFLAGS) -o $@ $<
+ g++ -c $(CFLAGS) -DGUI -o $@ $<
obj/%.o: %.cpp $(HEADERS) headers.h.gch
- g++ -c $(CFLAGS) -o $@ $<
+ g++ -c $(CFLAGS) -DGUI -o $@ $<
obj/sha.o: sha.cpp sha.h
g++ -c $(CFLAGS) -O3 -o $@ $<
@@ -61,10 +63,10 @@ bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha.o obj/nogui/%.o: %.cpp $(HEADERS)
- g++ -c $(CFLAGS) -DwxUSE_GUI=0 -o $@ $<
+ g++ -c $(CFLAGS) -o $@ $<
bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha.o
- g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -l wx_baseud-2.9 $(LIBS)
+ g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
clean:
|