Selaa lähdekoodia

Fix include for system lz4.

Adam Ierymenko 9 vuotta sitten
vanhempi
commit
6c6b18d003
2 muutettua tiedostoa jossa 5 lisäystä ja 0 poistoa
  1. 1 0
      make-linux.mk
  2. 4 0
      node/Packet.hpp

+ 1 - 0
make-linux.mk

@@ -41,6 +41,7 @@ ifeq ($(wildcard /usr/include/lz4.h),)
 	OBJS+=ext/lz4/lz4.o
 	OBJS+=ext/lz4/lz4.o
 else
 else
 	LDLIBS+=-llz4
 	LDLIBS+=-llz4
+	DEFS+=-DZT_USE_SYSTEM_LZ4
 endif
 endif
 ifeq ($(wildcard /usr/include/http_parser.h),)
 ifeq ($(wildcard /usr/include/http_parser.h),)
 	OBJS+=ext/http-parser/http_parser.o
 	OBJS+=ext/http-parser/http_parser.o

+ 4 - 0
node/Packet.hpp

@@ -34,7 +34,11 @@
 #include "Utils.hpp"
 #include "Utils.hpp"
 #include "Buffer.hpp"
 #include "Buffer.hpp"
 
 
+#ifdef ZT_USE_SYSTEM_LZ4
+#include <lz4.h>
+#else
 #include "../ext/lz4/lz4.h"
 #include "../ext/lz4/lz4.h"
+#endif
 
 
 /**
 /**
  * Protocol version -- incremented only for major changes
  * Protocol version -- incremented only for major changes