diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-09-29 06:49:23 -0700 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-09-29 06:49:23 -0700 |
commit | 68651275513c6d49a1a50ed2a1f7ef5d5f0e760e (patch) | |
tree | 67f8f34ba616df2b68d13725b1814bcd6cb70588 /src/Makefile.am | |
parent | 75d31c84dba2e5280341b756aa9dc39a345dfffd (diff) | |
parent | 5ceb9c963700d4639fb3210b98aa028113e2a9c4 (diff) | |
download | bitcoin-68651275513c6d49a1a50ed2a1f7ef5d5f0e760e.tar.xz |
Merge pull request #3015 from theuni/win32-version-info
Win32 version info
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3b0f096744..2d5b46c9c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ +include Makefile.include AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \ -I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \ - -I$(builddir) $(BOOST_INCLUDES) + -I$(builddir) $(BOOST_INCLUDES) $(BDB_CPPFLAGS) AM_LDFLAGS = $(PTHREAD_CFLAGS) noinst_LIBRARIES = libbitcoin.a @@ -47,6 +48,10 @@ bitcoind_LDADD = libbitcoin.a leveldb/libleveldb.a leveldb/libmemenv.a \ bitcoind_SOURCES = bitcoind.cpp # +if TARGET_WINDOWS +bitcoind_SOURCES += bitcoin-res.rc +endif + AM_CPPFLAGS += $(BDB_CPPFLAGS) bitcoind_LDADD += $(BDB_LIBS) |