diff options
| author | Jeff Garzik <jeff@garzik.org> | 2011-05-06 08:04:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-06 08:04:50 -0400 |
| commit | 2fb1124b0fbbc039307f3697d7d550365c21916c (patch) | |
| tree | d4123f999e1c7e44b6f2d299a554d21d0007fa63 /makefile.unix | |
| parent | 4408034bcd70032b582e26637a67166df578a8f4 (diff) | |
| parent | b26141e2c5836ccd20bd32a9c653cf2ba5e5b5ee (diff) | |
| download | bitcoin-2fb1124b0fbbc039307f3697d7d550365c21916c.tar.xz | |
Merge branch 'remove-4way' of github.com:jgarzik/bitcoin into tmp
Conflicts:
makefile.unix
Diffstat (limited to 'makefile.unix')
| -rw-r--r-- | makefile.unix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/makefile.unix b/makefile.unix index f1ffc2f7ed..4f2da37894 100644 --- a/makefile.unix +++ b/makefile.unix @@ -63,17 +63,14 @@ obj/%.o: %.cpp $(HEADERS) cryptopp/obj/%.o: cryptopp/%.cpp $(CXX) -c $(CXXFLAGS) -O3 -o $@ $< -obj/sha256.o: sha256.cpp - $(CXX) -c $(CXXFLAGS) -msse2 -O3 -march=amdfam10 -o $@ $< - -bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha256.o +bitcoin: $(OBJS) obj/ui.o obj/uibase.o $(CXX) $(CXXFLAGS) -o $@ $^ $(WXLIBS) $(LIBS) obj/nogui/%.o: %.cpp $(HEADERS) $(CXX) -c $(CXXFLAGS) -o $@ $< -bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha256.o +bitcoind: $(OBJS:obj/%=obj/nogui/%) $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) |