diff options
| author | Gregory Maxwell <greg@xiph.org> | 2012-10-29 12:48:55 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2012-10-29 12:48:55 -0700 |
| commit | 155bdd90b9690904309e462b1a77a89132c75555 (patch) | |
| tree | 546722ded7aedd053dfcca1b0a30a9385e43c650 /src | |
| parent | c13f5dbecf2bc22e81ad847f0cf4b1bf632cdd8d (diff) | |
| parent | 38fe2e6a68e94e262ab8a0d0370f3a6f042ee3db (diff) | |
Merge pull request #1966 from TheBlueMatt/leveldbmakefile
Build script fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.linux-mingw | 2 | ||||
| -rw-r--r-- | src/makefile.mingw | 3 | ||||
| -rw-r--r-- | src/makefile.osx | 2 | ||||
| -rw-r--r-- | src/makefile.unix | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index f4adbb2bff..64268dd0aa 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -92,7 +92,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a DEFS += -I"$(CURDIR)/leveldb/include" DEFS += -I"$(CURDIR)/leveldb/helpers" leveldb/libleveldb.a: - @echo "Building LevelDB ..."; cd leveldb; TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$(INCLUDEPATHS)" LDFLAGS="-L$(LIBPATHS)" make libleveldb.a libmemenv.a; cd .. + @echo "Building LevelDB ..." && cd leveldb && CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$(INCLUDEPATHS)" LDFLAGS="-L$(LIBPATHS)" make libleveldb.a libmemenv.a && i586-mingw32msvc-ranlib libleveldb.a && i586-mingw32msvc-ranlib libmemenv.a && cd .. obj/leveldb.o: leveldb/libleveldb.a obj/build.h: FORCE diff --git a/src/makefile.mingw b/src/makefile.mingw index 945ec77099..85d63e9ceb 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -94,8 +94,9 @@ test check: test_bitcoin.exe FORCE LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) +# TODO: If this fails, try adding a ranlib libleveldb.a && ranlib libmemenv.a leveldb/libleveldb.a: - cd leveldb; make libleveldb.a libmemenv.a; cd .. + cd leveldb && make libleveldb.a libmemenv.a && cd .. obj/leveldb.o: leveldb/libleveldb.lib obj/%.o: %.cpp $(HEADERS) diff --git a/src/makefile.osx b/src/makefile.osx index f3e17d0d13..9629545c0a 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -128,7 +128,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) leveldb/libleveldb.a: - @echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd .. + @echo "Building LevelDB ..." && cd leveldb && make libleveldb.a libmemenv.a && cd .. obj/leveldb.o: leveldb/libleveldb.a # auto-generated dependencies: diff --git a/src/makefile.unix b/src/makefile.unix index df05f7990a..653f512e82 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -144,7 +144,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) leveldb/libleveldb.a: - @echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; + @echo "Building LevelDB ..." && cd leveldb && make libleveldb.a libmemenv.a && cd .. obj/leveldb.o: leveldb/libleveldb.a # auto-generated dependencies: |