From 82b06469889cd63488c2867a32c3e20ab8584bc0 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 7 Aug 2012 22:55:07 +0200 Subject: Fix test_bitcoin build in makefile.linux-mingw --- src/makefile.linux-mingw | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 960716c147..5f0bdf67e9 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_47_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_47_0/stage/lib" \ @@ -85,7 +86,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: -- cgit v1.2.3