diff options
Diffstat (limited to 'external')
22 files changed, 21 insertions, 18 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 345aac3f6..eb6a1f294 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015, The Monero Project +# Copyright (c) 2014-2016, The Monero Project # # All rights reserved. # diff --git a/external/db_drivers/CMakeLists.txt b/external/db_drivers/CMakeLists.txt index 98c451ad1..5bc7b5c24 100644 --- a/external/db_drivers/CMakeLists.txt +++ b/external/db_drivers/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015, The Monero Project +# Copyright (c) 2014-2016, The Monero Project # # All rights reserved. # diff --git a/external/db_drivers/liblmdb/CMakeLists.txt b/external/db_drivers/liblmdb/CMakeLists.txt index d951c83c5..ec435d1c8 100644 --- a/external/db_drivers/liblmdb/CMakeLists.txt +++ b/external/db_drivers/liblmdb/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015, The Monero Project +# Copyright (c) 2014-2016, The Monero Project # # All rights reserved. # diff --git a/external/miniupnpc/CMakeLists.txt b/external/miniupnpc/CMakeLists.txt index f6cf592af..33fa8d663 100644 --- a/external/miniupnpc/CMakeLists.txt +++ b/external/miniupnpc/CMakeLists.txt @@ -4,6 +4,7 @@ project (miniupnpc C) set (MINIUPNPC_VERSION 1.9) set (MINIUPNPC_API_VERSION 15) +#[[ - we comment out this block as we don't support these other build types if (NOT CMAKE_BUILD_TYPE) if (WIN32) set (DEFAULT_BUILD_TYPE MinSizeRel) @@ -14,6 +15,7 @@ if (NOT CMAKE_BUILD_TYPE) "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) endif() +]] option (UPNPC_BUILD_STATIC "Build static library" TRUE) option (UPNPC_BUILD_SHARED "Build shared library" TRUE) @@ -39,6 +41,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") add_definitions (-D_DARWIN_C_SOURCE) endif () +#[[ - we comment out this block as we already set flags # Set compiler specific build flags if (CMAKE_COMPILER_IS_GNUC) # Set our own default flags at first run. @@ -61,6 +64,7 @@ if (CMAKE_COMPILER_IS_GNUC) endif (NOT CONFIGURED) endif () +]] configure_file (miniupnpcstrings.h.cmake ${CMAKE_BINARY_DIR}/miniupnpcstrings.h) include_directories (${CMAKE_BINARY_DIR}) @@ -93,8 +97,11 @@ if (WIN32) endif (WIN32) if (WIN32) - find_library (WINSOCK2_LIBRARY NAMES ws2_32 WS2_32 Ws2_32) - find_library (IPHLPAPI_LIBRARY NAMES iphlpapi) + # We use set instead of find_library because otherwise static compilation on Windows breaks. Don't ask me why, just roll with it. + # find_library (WINSOCK2_LIBRARY NAMES ws2_32 WS2_32 Ws2_32) + # find_library (IPHLPAPI_LIBRARY NAMES iphlpapi) + set (WINSOCK2_LIBRARY ws2_32) + set (IPHLPAPI_LIBRARY iphlpapi) set (LDLIBS ${WINSOCK2_LIBRARY} ${IPHLPAPI_LIBRARY} ${LDLIBS}) #elseif (CMAKE_SYSTEM_NAME STREQUAL "Solaris") # find_library (SOCKET_LIBRARY NAMES socket) @@ -173,6 +180,7 @@ install (FILES DESTINATION include/miniupnpc ) -set (CONFIGURED YES CACHE INTERNAL "") +# commented out by Ben Boeckel, who I presume knows what he's doing;) +# set (CONFIGURED YES CACHE INTERNAL "") # vim: ts=2:sw=2 diff --git a/external/miniupnpc/testdesc/new_LiveBox_desc.xml b/external/miniupnpc/testdesc/new_LiveBox_desc.xml index 620eb55af..9d5160bb8 100644 --- a/external/miniupnpc/testdesc/new_LiveBox_desc.xml +++ b/external/miniupnpc/testdesc/new_LiveBox_desc.xml @@ -87,4 +87,4 @@ </device>
</deviceList>
</device>
-</root>
\ No newline at end of file +</root> diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index 4edb51230..459ba860b 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2015, The Monero Project +# Copyright (c) 2014-2016, The Monero Project # # All rights reserved. # @@ -141,7 +141,7 @@ set(common_src set(compat_src) -foreach (symbol IN ITEMS ctime_r gmtime_r inet_aton inet_ntop inet_pton malloc memcmp memmove snprintf strlcat strlcpy strptime explicit_bzero arc4random arc4random_uniform sha512 reallocarray) +foreach (symbol IN ITEMS ctime_r gmtime_r inet_aton inet_ntop inet_pton isblank malloc memcmp memmove snprintf strlcat strlcpy strptime explicit_bzero arc4random arc4random_uniform sha512 reallocarray) string(TOUPPER "${symbol}" upper_sym) if (NOT HAVE_${upper_sym}) list(APPEND compat_src @@ -168,11 +168,6 @@ elseif (WIN32) compat/getentropy_win.c) endif () -if (NOT HAVE_ISBLANK) - list(APPEND compat_src - compat/isblank.c) -endif () - if (NOT HAVE_GETADDRINFO) list(APPEND compat_src compat/fake-rfc2553.c) diff --git a/external/unbound/config.h.cmake.in b/external/unbound/config.h.cmake.in index c64c3babb..861020ecd 100644 --- a/external/unbound/config.h.cmake.in +++ b/external/unbound/config.h.cmake.in @@ -216,7 +216,7 @@ #cmakedefine HAVE_IPHLPAPI_H /* Define to 1 if you have the `isblank' function. */ -#undef HAVE_ISBLANK +#cmakedefine HAVE_ISBLANK /* Define to 1 if you have the `kill' function. */ #cmakedefine HAVE_KILL diff --git a/external/unbound/contrib/create_unbound_ad_servers.sh b/external/unbound/contrib/create_unbound_ad_servers.sh index d31f078b3..c3b05c60c 100644 --- a/external/unbound/contrib/create_unbound_ad_servers.sh +++ b/external/unbound/contrib/create_unbound_ad_servers.sh @@ -36,4 +36,4 @@ echo "Done." # the unbound_ad_servers file: # # include: $dst_dir/unbound_ad_servers -#
\ No newline at end of file +# diff --git a/external/unbound/contrib/unbound_cache.sh b/external/unbound/contrib/unbound_cache.sh index b3e876ba9..fd2b4811d 100644 --- a/external/unbound/contrib/unbound_cache.sh +++ b/external/unbound/contrib/unbound_cache.sh @@ -171,4 +171,4 @@ elif [ "$save" = "2" ]; then reload_cache $file fi -exit 0
\ No newline at end of file +exit 0 diff --git a/external/unbound/contrib/unbound_cacti.tar.gz b/external/unbound/contrib/unbound_cacti.tar.gz Binary files differindex 36bbdecd7..cc29476c6 100644 --- a/external/unbound/contrib/unbound_cacti.tar.gz +++ b/external/unbound/contrib/unbound_cacti.tar.gz diff --git a/external/unbound/contrib/unbound_smf22.tar.gz b/external/unbound/contrib/unbound_smf22.tar.gz Binary files differindex e4c51c3dc..4845c3354 100644 --- a/external/unbound/contrib/unbound_smf22.tar.gz +++ b/external/unbound/contrib/unbound_smf22.tar.gz diff --git a/external/unbound/contrib/warmup.cmd b/external/unbound/contrib/warmup.cmd index b3895a86f..cbbdebc72 100644 --- a/external/unbound/contrib/warmup.cmd +++ b/external/unbound/contrib/warmup.cmd @@ -150,4 +150,4 @@ echo Saving cache... if exist unbound_cache.cmd unbound_cache.cmd -s
echo Done.
-exit 0
\ No newline at end of file +exit 0 diff --git a/external/unbound/doc/ietf67-design-02.odp b/external/unbound/doc/ietf67-design-02.odp Binary files differindex 4be2c7d4e..8321b556f 100644 --- a/external/unbound/doc/ietf67-design-02.odp +++ b/external/unbound/doc/ietf67-design-02.odp diff --git a/external/unbound/winrc/combined.ico b/external/unbound/winrc/combined.ico Binary files differindex aa65d11e2..b0a4f4d16 100644 --- a/external/unbound/winrc/combined.ico +++ b/external/unbound/winrc/combined.ico diff --git a/external/unbound/winrc/gen_msg.bin b/external/unbound/winrc/gen_msg.bin Binary files differindex 6e560057c..ed8f79e63 100644 --- a/external/unbound/winrc/gen_msg.bin +++ b/external/unbound/winrc/gen_msg.bin diff --git a/external/unbound/winrc/setup_left.bmp b/external/unbound/winrc/setup_left.bmp Binary files differindex ddc17d079..a013276a9 100644 --- a/external/unbound/winrc/setup_left.bmp +++ b/external/unbound/winrc/setup_left.bmp diff --git a/external/unbound/winrc/setup_top.bmp b/external/unbound/winrc/setup_top.bmp Binary files differindex 79998ec64..a7404c836 100644 --- a/external/unbound/winrc/setup_top.bmp +++ b/external/unbound/winrc/setup_top.bmp diff --git a/external/unbound/winrc/unbound16.ico b/external/unbound/winrc/unbound16.ico Binary files differindex e62634b70..06d82e571 100644 --- a/external/unbound/winrc/unbound16.ico +++ b/external/unbound/winrc/unbound16.ico diff --git a/external/unbound/winrc/unbound32.ico b/external/unbound/winrc/unbound32.ico Binary files differindex 64272eed4..7e5b3a725 100644 --- a/external/unbound/winrc/unbound32.ico +++ b/external/unbound/winrc/unbound32.ico diff --git a/external/unbound/winrc/unbound48.ico b/external/unbound/winrc/unbound48.ico Binary files differindex 074d12ebc..cb7291469 100644 --- a/external/unbound/winrc/unbound48.ico +++ b/external/unbound/winrc/unbound48.ico diff --git a/external/unbound/winrc/unbound64.ico b/external/unbound/winrc/unbound64.ico Binary files differindex c02f68f0a..ca2362e5d 100644 --- a/external/unbound/winrc/unbound64.ico +++ b/external/unbound/winrc/unbound64.ico diff --git a/external/unbound/winrc/unbound64.png b/external/unbound/winrc/unbound64.png Binary files differindex b37bf3f11..78d831565 100644 --- a/external/unbound/winrc/unbound64.png +++ b/external/unbound/winrc/unbound64.png |
