diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-11 03:51:08 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-11 14:04:42 +0200 |
| commit | 45771671704f0ed09aec48777c12f0af388d1beb (patch) | |
| tree | 26d167d58d718989cdf009f3ab1d3417e53d3034 /src/makefile.linux-mingw | |
| parent | 5d464a4a5552acd1fe7e6c9ba656f0d809ebcd44 (diff) | |
Fix build.h dependencies
For Qt builds, the build.h file is moved to build/build.h. For regular
builds, it is moved to obj/build.h. This allows the Qt build to be done
in a different directory than the source, and without interfering with
other builds.
Diffstat (limited to 'src/makefile.linux-mingw')
| -rw-r--r-- | src/makefile.linux-mingw | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 4922df599b..9f005424f6 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -10,7 +10,8 @@ INCLUDEPATHS= \ -I"$(DEPSDIR)/boost_1_47_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/openssl-1.0.0e/include" \ - -I"$(DEPSDIR)" + -I"$(DEPSDIR)" \ + -I"$(CURDIR)"/obj \ LIBPATHS= \ -L"$(DEPSDIR)/boost_1_47_0/stage/lib" \ @@ -65,14 +66,15 @@ OBJS= \ all: bitcoind.exe -build.h: FORCE - @../share/genbuild.sh build.h +obj/build.h: FORCE + ../share/genbuild.sh obj/build.h +version.cpp: obj/build.h DEFS += -DHAVE_BUILD_INFO obj/%.o: %.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< -bitcoind.exe: build.h $(OBJS:obj/%=obj/%) +bitcoind.exe: $(OBJS:obj/%=obj/%) i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) |