diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2012-08-07 17:59:06 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-08-07 17:59:06 -0700 |
| commit | 2c006b0b3e6a94fc0fdac80ff2db3af93f768064 (patch) | |
| tree | 4868d0c22eb9053096009763e7e06d1120c3eee3 /src/makefile.linux-mingw | |
| parent | c995995eb8627a56079180fceb85323e1b73495e (diff) | |
| parent | c5f90cd88b61ff28327eed4981903bdf72027cc5 (diff) | |
| download | bitcoin-2c006b0b3e6a94fc0fdac80ff2db3af93f768064.tar.xz | |
Merge pull request #1658 from TheBlueMatt/qttest
Fix several issues in the Qt unit tests.
Diffstat (limited to 'src/makefile.linux-mingw')
| -rw-r--r-- | src/makefile.linux-mingw | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index fc22bb76ee..51439c7b7c 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -7,11 +7,12 @@ DEPSDIR:=/usr/i586-mingw32msvc USE_UPNP:=0 INCLUDEPATHS= \ + -I"$(CURDIR)" \ + -I"$(CURDIR)"/obj \ -I"$(DEPSDIR)/boost_1_49_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/openssl-1.0.1b/include" \ - -I"$(DEPSDIR)" \ - -I"$(CURDIR)"/obj \ + -I"$(DEPSDIR)" LIBPATHS= \ -L"$(DEPSDIR)/boost_1_49_0/stage/lib" \ @@ -88,7 +89,7 @@ obj-test/%.o: test/%.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $< test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS) + i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS) clean: |