1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Tue, 05 Feb 2019 15:58:23 +0100
Description: use debian packaged libmurmurhash
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,6 @@ SOURCES=\
src/mash/HashPriorityQueue.cpp \
src/mash/HashSet.cpp \
src/mash/MinHashHeap.cpp \
- src/mash/MurmurHash3.cpp \
src/mash/mash.cpp \
src/mash/Sketch.cpp \
src/mash/sketchParameterSetup.cpp \
@@ -35,7 +34,7 @@ OBJECTS=$(SOURCES:.cpp=.o) src/mash/capn
all : mash libmash.a
mash : $(OBJECTS)
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o mash $(OBJECTS) -lkj -lcapnp @mathlib@ -lstdc++ -lz -lm -lpthread $(LDFLAGS)
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o mash $(OBJECTS) -lkj -lcapnp @mathlib@ -lstdc++ -lz -lm -lpthread -lmurmurhash $(LDFLAGS)
libmash.a : $(OBJECTS)
ar -cr libmash.a $(OBJECTS)
--- a/src/mash/Sketch.cpp
+++ b/src/mash/Sketch.cpp
@@ -12,7 +12,7 @@
#include <fcntl.h>
#include <map>
#include "kseq.h"
-#include "MurmurHash3.h"
+#include <murmurhash.h>
#include <assert.h>
#include <queue>
#include <deque>
--- a/src/mash/hash.cpp
+++ b/src/mash/hash.cpp
@@ -5,7 +5,7 @@
// See the LICENSE.txt file included with this software for license information.
#include "hash.h"
-#include "MurmurHash3.h"
+#include <murmurhash.h>
hash_u getHash(const char * seq, int length, uint32_t seed, bool use64)
{
|
