From 439c3dd6d2bb53f4b0a880da87f473cd7e545c54 Mon Sep 17 00:00:00 2001 From: Dimitris Apostolou Date: Sat, 8 Feb 2020 21:48:56 +0200 Subject: [PATCH] Remove libsnark preprocessor flags --- src/Makefile.am | 4 +--- src/Makefile.gtest.include | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a7d4500a9..c1c1961f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -519,12 +519,10 @@ libzcash_a_SOURCES = \ zcash/util.cpp \ zcash/zip32.cpp -libzcash_a_CPPFLAGS = $(AM_CPPFLAGS) $(PIC_FLAGS) -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) +libzcash_a_CPPFLAGS = $(AM_CPPFLAGS) $(PIC_FLAGS) $(BITCOIN_INCLUDES) libzcash_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libzcash_a_LDFLAGS = $(AM_LDFLAGS) -libzcash_a_CPPFLAGS += -DMONTGOMERY_OUTPUT - # zcashconsensus library # if BUILD_BITCOIN_LIBS include_HEADERS = script/zcashconsensus.h diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include index 06c1d3f27..7782fa206 100644 --- a/src/Makefile.gtest.include +++ b/src/Makefile.gtest.include @@ -51,7 +51,7 @@ zcash_gtest_SOURCES += \ wallet/gtest/test_wallet.cpp endif -zcash_gtest_CPPFLAGS = $(AM_CPPFLAGS) -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES) +zcash_gtest_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) zcash_gtest_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \