about summary refs log tree commit diff
path: root/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch
blob: f410d0f18b2bffa77a049a1c625503035265fc44 (plain) (blame)
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
diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y
index 30070f131..15f746a10 100644
--- a/src/Core/DataFilter.y
+++ b/src/Core/DataFilter.y
@@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement
 
 %}
 
+// generated by the scanner
+%define api.header.include {"DataFilter_yacc.h"}
+
 // Symbol can be meta, metric, variable or function name
 %token <string> SYMBOL PYTHON
 
diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y
index d6da086bd..f2001e23c 100644
--- a/src/Core/RideDB.y
+++ b/src/Core/RideDB.y
@@ -40,6 +40,8 @@ void RideDBerror(void*jc, const char *error) // used by parser aka yyerror()
 #define scanner jc->scanner
 
 %}
+// generated by the scanner
+%define api.header.include {"RideDB_yacc.h"}
 
 %pure-parser
 %lex-param { void *scanner }
diff --git a/src/FileIO/JsonRideFile.y b/src/FileIO/JsonRideFile.y
index 2cbbef9fc..d5c77a779 100644
--- a/src/FileIO/JsonRideFile.y
+++ b/src/FileIO/JsonRideFile.y
@@ -106,6 +106,9 @@ static QString protect(const QString string)
 
 %}
 
+// generated by the scanner
+%define api.header.include {"JsonRideFile_yacc.h"}
+
 %pure-parser
 %lex-param { void *scanner }
 %parse-param { struct JsonContext *jc }
diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in
index a280bbb6b..07e543372 100644
--- a/src/gcconfig.pri.in
+++ b/src/gcconfig.pri.in
@@ -75,10 +75,10 @@
 
 # Let us know where flex and bison are installed.
 # You may need to specify the full path if things don't work.
-#QMAKE_LEX  = flex
-#QMAKE_YACC = bison
+QMAKE_LEX  = flex
+QMAKE_YACC = bison
 # If you are using bison 3.7 or higher, uncomment the line below
-#QMAKE_MOVE = cp
+QMAKE_MOVE = cp
 # If you're compiling with nmake and VC then you
 # will likely also use win_flex and win_bison
 # so uncomment below