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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From: Bastian Germann <bastiangermann@fishpost.de>
Date: Thu, 21 May 2020 11:32:59 +0200
Description: Build with system's LZ4
---
diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
index 43c6162..bb872ce 100644
--- a/compiler/CMakeLists.txt
+++ b/compiler/CMakeLists.txt
@@ -22,9 +22,8 @@ message(STATUS "ICU Libraries: " ${ICU_VERSION})
add_subdirectory(Generic)
add_subdirectory(Grammar)
-add_subdirectory(LZ4)
-include_directories(Generic Grammar LZ4 ${ICU_INCLUDE_DIR})
+include_directories(Generic Grammar ${ICU_INCLUDE_DIR})
add_library(TtfUtil OBJECT TtfUtil.cpp)
target_compile_definitions(TtfUtil PUBLIC $<${BIGENDIAN_SYSTEM}:WORDS_BIGENDIAN>)
diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index 2cf0fea..3bd2242 100644
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -1,7 +1,7 @@
-AM_CPPFLAGS = -I@srcdir@/Generic -I@srcdir@/Grammar -I@srcdir@/LZ4
+AM_CPPFLAGS = -I@srcdir@/Generic -I@srcdir@/Grammar
-SUBDIRS = Generic Grammar LZ4
-LIBS = @LIBS@ @LIBICONV@ -LGeneric -LGrammar -LLZ4 -lgeneric -lparser -llz4
+SUBDIRS = Generic Grammar
+LIBS = @LIBS@ @LIBICONV@ -LGeneric -LGrammar -lgeneric -lparser -llz4
EXTRA_DIST = resource.h GrCompiler.rc GrpParser.g GrpParser_readme.txt GrpParserTokenTypes.txt stddef.gdh
bin_PROGRAMS = grcompiler
diff --git a/compiler/OutputToFont.cpp b/compiler/OutputToFont.cpp
index 677a04a..a462fed 100644
--- a/compiler/OutputToFont.cpp
+++ b/compiler/OutputToFont.cpp
@@ -16,7 +16,7 @@ Description:
Include files
***********************************************************************************************/
#include "main.h"
-#include "LZ4/lz4hc.h"
+#include <lz4hc.h>
#include <algorithm>
#include <codecvt>
diff --git a/configure.ac b/configure.ac
index f9439c3..22cf145 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,6 @@ AC_CONFIG_FILES(Makefile \
compiler/Makefile \
compiler/Generic/Makefile \
compiler/Grammar/Makefile \
- compiler/LZ4/Makefile \
test/Makefile)
AC_CONFIG_SUBDIRS([test/GrcRegressionTest])
|
