DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'remove-4way' of github.com:jgarzik/bitcoin into tmp

Browse Source 
Conflicts:
	makefile.unix
This commit is contained in:
Jeff Garzik
2011-05-06 08:04:50 -04:00
committed by Jeff Garzik
parent 4408034bcd b26141e2c5
commit 2fb1124b0f
3 changed files with 5 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
makefile.unix
View File

@@ -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)