Update boost, secp256k1 & m4; drop libpng, libz & qrencode; add tiff & embed qrencode.

.travis.yml

@@ -77,9 +77,9 @@ install:
 script:
 
     # Download and build libbitcoin-system and all dependencies.
-    - if [[ $OSX   && $CLANG && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --with-icu --with-png --with-qrencode --build-icu --build-zlib --build-png --build-qrencode --build-boost --disable-shared --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
-    - if [[ $LINUX && $CLANG && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --with-icu --with-png --with-qrencode --build-icu --build-zlib --build-png --build-qrencode --build-boost --disable-shared --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
-    - if [[ $LINUX && $GCC   && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --with-icu --with-png --with-qrencode --build-icu --build-zlib --build-png --build-qrencode --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
+    - if [[ $OSX   && $CLANG && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --with-icu --build-icu --build-boost --disable-shared --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
+    - if [[ $LINUX && $CLANG && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --with-icu --build-icu --build-boost --disable-shared --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
+    - if [[ $LINUX && $GCC   && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --with-icu --build-icu --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
     - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-static; fi
     - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --with-icu --build-icu --build-boost --disable-ndebug --disable-static --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
     - if [[ $LINUX && $GCC   && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-static --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi

Makefile.am

@@ -32,9 +32,9 @@ doc_DATA = \
 # src/libbitcoin-system.la => ${libdir}
 #------------------------------------------------------------------------------
 lib_LTLIBRARIES = src/libbitcoin-system.la
-src_libbitcoin_system_la_CPPFLAGS = -I${srcdir}/include ${icu} ${png} ${qrencode} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${png_BUILD_CPPFLAGS} ${qrencode_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
+src_libbitcoin_system_la_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
 src_libbitcoin_system_la_LDFLAGS = ${boost_LDFLAGS}
-src_libbitcoin_system_la_LIBADD = ${boost_chrono_LIBS} ${boost_date_time_LIBS} ${boost_filesystem_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_log_LIBS} ${boost_program_options_LIBS} ${boost_regex_LIBS} ${boost_system_LIBS} ${boost_thread_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${png_LIBS} ${qrencode_LIBS} ${secp256k1_LIBS}
+src_libbitcoin_system_la_LIBADD = ${boost_chrono_LIBS} ${boost_date_time_LIBS} ${boost_filesystem_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_log_LIBS} ${boost_program_options_LIBS} ${boost_regex_LIBS} ${boost_system_LIBS} ${boost_thread_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${secp256k1_LIBS}
 src_libbitcoin_system_la_SOURCES = \
     src/error.cpp \
     src/settings.cpp \
@@ -188,7 +188,6 @@ src_libbitcoin_system_la_SOURCES = \
     src/utility/neutrino_filter.cpp \
     src/utility/ostream_bit_writer.cpp \
     src/utility/ostream_writer.cpp \
-    src/utility/png.cpp \
     src/utility/prioritized_mutex.cpp \
     src/utility/property_tree.cpp \
     src/utility/pseudo_random.cpp \
@@ -199,6 +198,7 @@ src_libbitcoin_system_la_SOURCES = \
     src/utility/string.cpp \
     src/utility/thread.cpp \
     src/utility/threadpool.cpp \
+    src/utility/tiff.cpp \
     src/utility/work.cpp \
     src/wallet/bitcoin_uri.cpp \
     src/wallet/dictionary_en.cpp \
@@ -228,7 +228,7 @@ src_libbitcoin_system_la_SOURCES = \
     src/wallet/mini_keys.cpp \
     src/wallet/mnemonic.cpp \
     src/wallet/payment_address.cpp \
-    src/wallet/qrcode.cpp \
+    src/wallet/qr_code.cpp \
     src/wallet/select_outputs.cpp \
     src/wallet/stealth_address.cpp \
     src/wallet/stealth_receiver.cpp \
@@ -244,16 +244,35 @@ src_libbitcoin_system_la_SOURCES = \
     src/wallet/parse_encrypted_keys/parse_encrypted_public.cpp \
     src/wallet/parse_encrypted_keys/parse_encrypted_public.hpp \
     src/wallet/parse_encrypted_keys/parse_encrypted_token.cpp \
-    src/wallet/parse_encrypted_keys/parse_encrypted_token.hpp
+    src/wallet/parse_encrypted_keys/parse_encrypted_token.hpp \
+    src/wallet/qrencode/bitstream.c \
+    src/wallet/qrencode/bitstream.h \
+    src/wallet/qrencode/mask.c \
+    src/wallet/qrencode/mask.h \
+    src/wallet/qrencode/mmask.c \
+    src/wallet/qrencode/mmask.h \
+    src/wallet/qrencode/mqrspec.c \
+    src/wallet/qrencode/mqrspec.h \
+    src/wallet/qrencode/qrencode.c \
+    src/wallet/qrencode/qrencode.h \
+    src/wallet/qrencode/qrencode_inner.h \
+    src/wallet/qrencode/qrinput.c \
+    src/wallet/qrencode/qrinput.h \
+    src/wallet/qrencode/qrspec.c \
+    src/wallet/qrencode/qrspec.h \
+    src/wallet/qrencode/rsecc.c \
+    src/wallet/qrencode/rsecc.h \
+    src/wallet/qrencode/split.c \
+    src/wallet/qrencode/split.h
 
 # local: examples/libbitcoin-system-examples
 #------------------------------------------------------------------------------
 if WITH_EXAMPLES
 
 noinst_PROGRAMS = examples/libbitcoin-system-examples
-examples_libbitcoin_system_examples_CPPFLAGS = -I${srcdir}/include ${icu} ${png} ${qrencode} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${png_BUILD_CPPFLAGS} ${qrencode_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
+examples_libbitcoin_system_examples_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
 examples_libbitcoin_system_examples_LDFLAGS = ${boost_LDFLAGS}
-examples_libbitcoin_system_examples_LDADD = src/libbitcoin-system.la ${boost_chrono_LIBS} ${boost_date_time_LIBS} ${boost_filesystem_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_log_LIBS} ${boost_program_options_LIBS} ${boost_regex_LIBS} ${boost_system_LIBS} ${boost_thread_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${png_LIBS} ${qrencode_LIBS} ${secp256k1_LIBS}
+examples_libbitcoin_system_examples_LDADD = src/libbitcoin-system.la ${boost_chrono_LIBS} ${boost_date_time_LIBS} ${boost_filesystem_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_log_LIBS} ${boost_program_options_LIBS} ${boost_regex_LIBS} ${boost_system_LIBS} ${boost_thread_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${secp256k1_LIBS}
 examples_libbitcoin_system_examples_SOURCES = \
     examples/main.cpp
 
@@ -266,9 +285,9 @@ if WITH_TESTS
 TESTS = libbitcoin-system-test_runner.sh
 
 check_PROGRAMS = test/libbitcoin-system-test
-test_libbitcoin_system_test_CPPFLAGS = -I${srcdir}/include ${icu} ${png} ${qrencode} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${png_BUILD_CPPFLAGS} ${qrencode_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
+test_libbitcoin_system_test_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
 test_libbitcoin_system_test_LDFLAGS = ${boost_LDFLAGS}
-test_libbitcoin_system_test_LDADD = src/libbitcoin-system.la ${boost_unit_test_framework_LIBS} ${boost_chrono_LIBS} ${boost_date_time_LIBS} ${boost_filesystem_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_log_LIBS} ${boost_program_options_LIBS} ${boost_regex_LIBS} ${boost_system_LIBS} ${boost_thread_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${png_LIBS} ${qrencode_LIBS} ${secp256k1_LIBS}
+test_libbitcoin_system_test_LDADD = src/libbitcoin-system.la ${boost_unit_test_framework_LIBS} ${boost_chrono_LIBS} ${boost_date_time_LIBS} ${boost_filesystem_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_log_LIBS} ${boost_program_options_LIBS} ${boost_regex_LIBS} ${boost_system_LIBS} ${boost_thread_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${secp256k1_LIBS}
 test_libbitcoin_system_test_SOURCES = \
     test/main.cpp \
     test/overloads.cpp \
@@ -371,12 +390,12 @@ test_libbitcoin_system_test_SOURCES = \
     test/utility/data.cpp \
     test/utility/endian.cpp \
     test/utility/neutrino_filter.cpp \
-    test/utility/png.cpp \
     test/utility/property_tree.cpp \
     test/utility/pseudo_random.cpp \
     test/utility/serializer.cpp \
     test/utility/stream.cpp \
     test/utility/thread.cpp \
+    test/utility/tiff.cpp \
     test/wallet/bitcoin_uri.cpp \
     test/wallet/ec_private.cpp \
     test/wallet/ec_public.cpp \
@@ -388,7 +407,7 @@ test_libbitcoin_system_test_SOURCES = \
     test/wallet/mnemonic.cpp \
     test/wallet/mnemonic.hpp \
     test/wallet/payment_address.cpp \
-    test/wallet/qrcode.cpp \
+    test/wallet/qr_code.cpp \
     test/wallet/select_outputs.cpp \
     test/wallet/stealth_address.cpp \
     test/wallet/stealth_receiver.cpp \
@@ -651,7 +670,6 @@ include_bitcoin_system_utility_HEADERS = \
     include/bitcoin/system/utility/ostream_bit_writer.hpp \
     include/bitcoin/system/utility/ostream_writer.hpp \
     include/bitcoin/system/utility/pending.hpp \
-    include/bitcoin/system/utility/png.hpp \
     include/bitcoin/system/utility/prioritized_mutex.hpp \
     include/bitcoin/system/utility/property_tree.hpp \
     include/bitcoin/system/utility/pseudo_random.hpp \
@@ -667,6 +685,7 @@ include_bitcoin_system_utility_HEADERS = \
     include/bitcoin/system/utility/synchronizer.hpp \
     include/bitcoin/system/utility/thread.hpp \
     include/bitcoin/system/utility/threadpool.hpp \
+    include/bitcoin/system/utility/tiff.hpp \
     include/bitcoin/system/utility/timer.hpp \
     include/bitcoin/system/utility/track.hpp \
     include/bitcoin/system/utility/work.hpp \
@@ -690,7 +709,7 @@ include_bitcoin_system_wallet_HEADERS = \
     include/bitcoin/system/wallet/mini_keys.hpp \
     include/bitcoin/system/wallet/mnemonic.hpp \
     include/bitcoin/system/wallet/payment_address.hpp \
-    include/bitcoin/system/wallet/qrcode.hpp \
+    include/bitcoin/system/wallet/qr_code.hpp \
     include/bitcoin/system/wallet/select_outputs.hpp \
     include/bitcoin/system/wallet/stealth_address.hpp \
     include/bitcoin/system/wallet/stealth_receiver.hpp \

builds/cmake/CMakeLists.txt

@@ -97,22 +97,6 @@ if (with-icu)
     set( icu "-DWITH_ICU" )
 endif()
 
-# Implement -Dwith-png and output ${png}.
-#------------------------------------------------------------------------------
-set( with-png "no" CACHE BOOL "Compile with Libpng support." )
-
-if (with-png)
-    set( png "-DWITH_PNG" )
-endif()
-
-# Implement -Dwith-qrencode and output ${qrencode}.
-#------------------------------------------------------------------------------
-set( with-qrencode "no" CACHE BOOL "Compile with QREncode." )
-
-if (with-qrencode)
-    set( qrencode "-DWITH_QRENCODE" )
-endif()
-
 # Implement -Denable-ndebug and define NDEBUG.
 #------------------------------------------------------------------------------
 set( enable-ndebug "yes" CACHE BOOL "Compile without debug assertions." )
@@ -129,7 +113,7 @@ endif()
 
 # Find boost
 #------------------------------------------------------------------------------
-find_package( Boost 1.62.0 REQUIRED COMPONENTS
+find_package( Boost 1.72.0 REQUIRED COMPONENTS
     atomic
     chrono
     date_time
@@ -201,21 +185,9 @@ if ((${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
     find_package( Dl REQUIRED )
 endif()
 
-# Find png
-#------------------------------------------------------------------------------
-if (with-png)
-    find_package( Png 1.6.37 REQUIRED )
-endif()
-
-# Find qrencode
-#------------------------------------------------------------------------------
-if (with-qrencode)
-    find_package( Qrencode 3.4.4 REQUIRED )
-endif()
-
 # Find secp256k1
 #------------------------------------------------------------------------------
-find_package( Secp256K1 0.0.1 REQUIRED )
+find_package( Secp256K1 0.1.0.19 REQUIRED )
 
 # Define project common includes directories
 #------------------------------------------------------------------------------
@@ -226,8 +198,6 @@ if (BUILD_SHARED_LIBS)
         ${rt_INCLUDE_DIRS}
         ${icu_i18n_INCLUDE_DIRS}
         ${dl_INCLUDE_DIRS}
-        ${png_INCLUDE_DIRS}
-        ${qrencode_INCLUDE_DIRS}
         ${secp256k1_INCLUDE_DIRS} )
 else()
     include_directories( SYSTEM
@@ -236,8 +206,6 @@ else()
         ${rt_INCLUDE_DIRS}
         ${icu_i18n_STATIC_INCLUDE_DIRS}
         ${dl_INCLUDE_DIRS}
-        ${png_STATIC_INCLUDE_DIRS}
-        ${qrencode_STATIC_INCLUDE_DIRS}
         ${secp256k1_STATIC_INCLUDE_DIRS} )
 endif()
 
@@ -250,8 +218,6 @@ if (BUILD_SHARED_LIBS)
         ${rt_LIBRARY_DIRS}
         ${icu_i18n_LIBRARY_DIRS}
         ${dl_LIBRARY_DIRS}
-        ${png_LIBRARY_DIRS}
-        ${qrencode_LIBRARY_DIRS}
         ${secp256k1_LIBRARY_DIRS} )
 else()
     link_directories(
@@ -260,8 +226,6 @@ else()
         ${rt_LIBRARY_DIRS}
         ${icu_i18n_STATIC_LIBRARY_DIRS}
         ${dl_LIBRARY_DIRS}
-        ${png_STATIC_LIBRARY_DIRS}
-        ${qrencode_STATIC_LIBRARY_DIRS}
         ${secp256k1_STATIC_LIBRARY_DIRS} )
 endif()
 
@@ -285,8 +249,6 @@ if (BUILD_SHARED_LIBS)
         ${rt_LIBRARIES}
         ${icu_i18n_LIBRARIES}
         ${dl_LIBRARIES}
-        ${png_LIBRARIES}
-        ${qrencode_LIBRARIES}
         ${secp256k1_LIBRARIES} )
 else()
     link_libraries(
@@ -306,15 +268,11 @@ else()
         ${rt_LIBRARIES}
         ${icu_i18n_STATIC_LIBRARIES}
         ${dl_LIBRARIES}
-        ${png_STATIC_LIBRARIES}
-        ${qrencode_STATIC_LIBRARIES}
         ${secp256k1_STATIC_LIBRARIES} )
 endif()
 
 add_definitions(
-    ${icu}
-    ${png}
-    ${qrencode} )
+    ${icu} )
 
 # Define ${CANONICAL_LIB_NAME} project.
 #------------------------------------------------------------------------------
@@ -471,7 +429,6 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/utility/neutrino_filter.cpp"
     "../../src/utility/ostream_bit_writer.cpp"
     "../../src/utility/ostream_writer.cpp"
-    "../../src/utility/png.cpp"
     "../../src/utility/prioritized_mutex.cpp"
     "../../src/utility/property_tree.cpp"
     "../../src/utility/pseudo_random.cpp"
@@ -482,6 +439,7 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/utility/string.cpp"
     "../../src/utility/thread.cpp"
     "../../src/utility/threadpool.cpp"
+    "../../src/utility/tiff.cpp"
     "../../src/utility/work.cpp"
     "../../src/wallet/bitcoin_uri.cpp"
     "../../src/wallet/dictionary_en.cpp"
@@ -511,7 +469,7 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/wallet/mini_keys.cpp"
     "../../src/wallet/mnemonic.cpp"
     "../../src/wallet/payment_address.cpp"
-    "../../src/wallet/qrcode.cpp"
+    "../../src/wallet/qr_code.cpp"
     "../../src/wallet/select_outputs.cpp"
     "../../src/wallet/stealth_address.cpp"
     "../../src/wallet/stealth_receiver.cpp"
@@ -527,7 +485,26 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/wallet/parse_encrypted_keys/parse_encrypted_public.cpp"
     "../../src/wallet/parse_encrypted_keys/parse_encrypted_public.hpp"
     "../../src/wallet/parse_encrypted_keys/parse_encrypted_token.cpp"
-    "../../src/wallet/parse_encrypted_keys/parse_encrypted_token.hpp" )
+    "../../src/wallet/parse_encrypted_keys/parse_encrypted_token.hpp"
+    "../../src/wallet/qrencode/bitstream.c"
+    "../../src/wallet/qrencode/bitstream.h"
+    "../../src/wallet/qrencode/mask.c"
+    "../../src/wallet/qrencode/mask.h"
+    "../../src/wallet/qrencode/mmask.c"
+    "../../src/wallet/qrencode/mmask.h"
+    "../../src/wallet/qrencode/mqrspec.c"
+    "../../src/wallet/qrencode/mqrspec.h"
+    "../../src/wallet/qrencode/qrencode.c"
+    "../../src/wallet/qrencode/qrencode.h"
+    "../../src/wallet/qrencode/qrencode_inner.h"
+    "../../src/wallet/qrencode/qrinput.c"
+    "../../src/wallet/qrencode/qrinput.h"
+    "../../src/wallet/qrencode/qrspec.c"
+    "../../src/wallet/qrencode/qrspec.h"
+    "../../src/wallet/qrencode/rsecc.c"
+    "../../src/wallet/qrencode/rsecc.h"
+    "../../src/wallet/qrencode/split.c"
+    "../../src/wallet/qrencode/split.h" )
 
 # ${CANONICAL_LIB_NAME} project specific include directories.
 #------------------------------------------------------------------------------
@@ -539,8 +516,6 @@ if (BUILD_SHARED_LIBS)
         ${rt_INCLUDE_DIRS}
         ${icu_i18n_INCLUDE_DIRS}
         ${dl_INCLUDE_DIRS}
-        ${png_INCLUDE_DIRS}
-        ${qrencode_INCLUDE_DIRS}
         ${secp256k1_INCLUDE_DIRS} )
 else()
     target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
@@ -550,8 +525,6 @@ else()
         ${rt_INCLUDE_DIRS}
         ${icu_i18n_STATIC_INCLUDE_DIRS}
         ${dl_INCLUDE_DIRS}
-        ${png_STATIC_INCLUDE_DIRS}
-        ${qrencode_STATIC_INCLUDE_DIRS}
         ${secp256k1_STATIC_INCLUDE_DIRS} )
 endif()
 
@@ -576,8 +549,6 @@ if (BUILD_SHARED_LIBS)
         ${rt_LIBRARIES}
         ${icu_i18n_LIBRARIES}
         ${dl_LIBRARIES}
-        ${png_LIBRARIES}
-        ${qrencode_LIBRARIES}
         ${secp256k1_LIBRARIES} )
 else()
     target_link_libraries( ${CANONICAL_LIB_NAME}
@@ -595,8 +566,6 @@ else()
         ${rt_LIBRARIES}
         ${icu_i18n_STATIC_LIBRARIES}
         ${dl_LIBRARIES}
-        ${png_STATIC_LIBRARIES}
-        ${qrencode_STATIC_LIBRARIES}
         ${secp256k1_STATIC_LIBRARIES} )
 endif()
 
@@ -723,12 +692,12 @@ if (with-tests)
         "../../test/utility/data.cpp"
         "../../test/utility/endian.cpp"
         "../../test/utility/neutrino_filter.cpp"
-        "../../test/utility/png.cpp"
         "../../test/utility/property_tree.cpp"
         "../../test/utility/pseudo_random.cpp"
         "../../test/utility/serializer.cpp"
         "../../test/utility/stream.cpp"
         "../../test/utility/thread.cpp"
+        "../../test/utility/tiff.cpp"
         "../../test/wallet/bitcoin_uri.cpp"
         "../../test/wallet/ec_private.cpp"
         "../../test/wallet/ec_public.cpp"
@@ -740,7 +709,7 @@ if (with-tests)
         "../../test/wallet/mnemonic.cpp"
         "../../test/wallet/mnemonic.hpp"
         "../../test/wallet/payment_address.cpp"
-        "../../test/wallet/qrcode.cpp"
+        "../../test/wallet/qr_code.cpp"
         "../../test/wallet/select_outputs.cpp"
         "../../test/wallet/stealth_address.cpp"
         "../../test/wallet/stealth_receiver.cpp"

builds/msvc/vs2013/libbitcoin-system-examples/libbitcoin-system-examples.props

@@ -13,8 +13,6 @@
     <ClCompile>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <EnablePREfast>false</EnablePREfast>
-      <!-- WIN32_LEAN_AND_MEAN avoids boost conflict: lists.boost.org/boost-users/2008/07/37824.php. -->
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 
@@ -45,7 +43,7 @@
 
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-secp256k1 : $(Linkage-secp256k1)" Importance="high"/>
-    <Message Text="Linkage-libbitcoin-system: $(Linkage-libbitcoin-system)" Importance="high"/>
+    <Message Text="Linkage-_system   : $(Linkage-libbitcoin-system)" Importance="high"/>
   </Target>
 
 </Project>