Ryan Tharp
cd8aba4d4e
daemon don't override the existing CURL
2019-12-23 07:16:13 +00:00
Ryan Tharp
20ce679c3a
macos release needs the include path
2019-12-23 07:15:51 +00:00
Ryan Tharp
53fd3a079a
Merge branch 'master' of https://github.com/loki-project/loki-network into linux_static
2019-12-23 07:11:24 +00:00
Ryan Tharp
b21b0b49d0
support LIBCURL_ROOT, disable LIBUV includes
2019-12-23 06:55:02 +00:00
Ryan Tharp
6001215a23
bring in all updates from STATIC_RUNTIME
2019-12-23 06:55:02 +00:00
Ryan Tharp
60a36a4a7d
when STATIC_LINK search for static versions of libraries, delay CURL detection until later
2019-12-23 06:55:02 +00:00
Jeff
5cddf1d90a
Merge pull request #999 from loki-project/dev
...
merge dev into master for 0.6.1
2019-12-22 16:29:47 -05:00
Jeff
7672294fa5
Merge pull request #1001 from majestrate/dev-format-2019-12-22
...
make format
2019-12-22 09:18:09 -05:00
Jeff Becker
8b8d636ded
make format
2019-12-22 09:16:28 -05:00
Jeff
013a312363
Merge pull request #1000 from despair86/dev
...
no more MSVC builds pls
2019-12-22 08:56:32 -05:00
Rick V
b9c02d999f
why was this there
...
we do not support MSVC
2019-12-22 07:49:36 -06:00
Jeff
693a8de669
Merge pull request #997 from jagerman/travis-salt
...
Enable DOWNLOAD_SODIUM for travis builds
2019-12-21 08:12:31 -05:00
Jeff
9444a7b8d1
Merge pull request #989 from loki-project/neuroscr-readme-update
...
Update readme.md
2019-12-19 20:12:15 -05:00
Jeff
8db9ae2e40
Merge pull request #998 from notlesh/enable_api_by_default
...
Enable the JSON RPC API by default
2019-12-19 18:35:32 -05:00
Ryan Tharp
5a7fda50a8
remove win32 note per Jeff
2019-12-19 14:25:32 -08:00
Stephen Shelton
1300de2387
Enable the JSON RPC API by default
2019-12-19 14:54:09 -07:00
Jeff
414c2f042b
Merge pull request #996 from jagerman/hash-fix
...
AlignedBuffer<N>::Hash fix
2019-12-19 16:00:07 -05:00
Jason Rhinelander
9cf30c424a
Enable DOWNLOAD_SODIUM for travis builds
2019-12-19 16:27:04 -04:00
Jason Rhinelander
1b710455a7
Disallow AlignedBuffer < 8 bytes; add oddball buffer sizes
2019-12-19 16:17:02 -04:00
Jason Rhinelander
d57d6bfc6d
Use memcpy to extract hash value
...
Using the straight reinterpret_cast runs into type aliasing issues,
which manifest on armhf. C++20 adds `std::bit_cast` to deal with
exactly this, but memcpy is the pre-C++20 way to do it properly.
2019-12-19 15:55:02 -04:00
Jeff
3c9df38b88
Merge pull request #990 from tewinget/libuv-timers
...
Libuv-based timers
2019-12-19 10:37:28 -05:00
Jeff Becker
16c7e7dd33
fix unit tests
2019-12-19 10:25:52 -05:00
Jeff
4a6034bb1f
Merge pull request #994 from loki-project/neuroscr-gitlabci-fix
...
try to fix gitlab CI (redo 991)
2019-12-19 07:35:10 -05:00
Ryan Tharp
4230ca8d77
correct ninja binary case
2019-12-18 17:49:56 -08:00
Ryan Tharp
47e19b8c19
try to fix gitlab CI (from 991)
2019-12-18 17:47:21 -08:00
Jason Rhinelander
134707d327
Merge pull request #993 from jagerman/m2d
...
Merge master changes into dev
2019-12-18 21:46:34 -04:00
Jason Rhinelander
c105f16fd6
Merge pull request #992 from loki-project/neuroscr-xenial-compat
...
Xenial compatibility
2019-12-18 21:41:21 -04:00
Ryan Tharp
4bea4867d0
Xenial compatibility
...
per https://github.com/loki-project/loki-network/blob/ubuntu/xenial/debian/patches/0004-Reduce-required-cmake-version.patch
2019-12-18 17:39:42 -08:00
Thomas Winget
f4c9e09d44
remove obsolete timer-related code
2019-12-18 19:05:33 -05:00
Ryan Tharp
46a86741c2
Update readme.md
2019-12-18 15:43:32 -08:00
Thomas Winget
e53e3db171
make dht context use new libuv timers
2019-12-18 13:35:18 -05:00
Thomas Winget
55b44cfc13
fix derp nested function call and derp merge error
2019-12-18 13:35:01 -05:00
Thomas Winget
50118c3127
Change ILinkLayer::ScheduleTick to use new timer
2019-12-18 13:11:25 -05:00
Thomas Winget
71bb0dd520
implement timers using libuv
...
So far only a bit of the code using timers has been modified to use
the new libuv-based timers. Also only the non-Windows case has been
implemented. Seems to be working though, so it's a good time to commit.
2019-12-18 13:11:13 -05:00
Jeff
a980eff8ef
Merge pull request #981 from jagerman/optional-sodium-dl
...
Add -DDOWNLOAD_SODIUM=ON to re-enable downloaded sodium (but now opt-in)
2019-12-17 07:43:19 -05:00
Jeff
2fde993a7a
Merge pull request #980 from despair86/dev
...
netid changed again
2019-12-17 07:42:35 -05:00
Rick V
5d9225dbf9
do not hardcode version into user-agent string
2019-12-16 18:59:45 -06:00
Jason Rhinelander
54b644e280
Add -DDOWNLOAD_SODIUM to re-enabled dl&build of sodium
...
Also supported in the Makefile (e.g. `make DOWNLOAD_SODIUM=ON`)
Also DRYs out the Makefile a little.
2019-12-16 20:52:44 -04:00
Rick V
9aefa32964
update netid on windows side
2019-12-16 18:48:35 -06:00
Jeff
89aedcb0b2
Merge pull request #979 from majestrate/master
...
netid update
2019-12-16 18:32:57 -05:00
Jeff Becker
0eb4efdce9
netid update
2019-12-16 18:31:26 -05:00
Jeff
a8ec956e64
Merge pull request #978 from loki-project/dev
...
v0.6.0
2019-12-16 18:22:20 -05:00
Jeff
d532c4784e
Merge pull request #968 from despair86/dev
...
post-RC2 fixes for windows and unix
2019-12-16 14:03:54 -05:00
Rick V
a62a75d640
nit
2019-12-16 12:11:07 -06:00
Rick V
ccd936feb1
the internal windows toolchain _already_ provides a default manifest
2019-12-16 11:32:50 -06:00
Rick V
a08d2ff64e
microsoft libc a shit
2019-12-16 11:32:50 -06:00
Rick V
caa6549cbb
clang-format everything
2019-12-16 11:32:49 -06:00
Rick V
fd6602bf05
fix versiontag
2019-12-16 11:32:42 -06:00
Rick V
5d914cedd8
add definitions for System5 and generic non-Apple BSD
2019-12-16 11:31:24 -06:00
Rick V
64710ca4d4
Explicitly align to 16 bytes on Win32 targets
2019-12-16 11:28:48 -06:00
