summarylogtreecommitdiffstats
path: root/nogcj.patch
blob: d312cb81ae7f7f1539158625d9542df466cb669f (plain)
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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-armv7hl/pom.xml	2017-02-08 22:06:28.220720753 +0100
@@ -22,8 +22,8 @@
 		
 		<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
 		<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
-		<tuxguitar-alsa.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-alsa.jni.cflags>
-		<tuxguitar-alsa.jni.ldflags>-fPIC</tuxguitar-alsa.jni.ldflags>
+		<tuxguitar-alsa.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-alsa.jni.cflags>
+		<tuxguitar-alsa.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-alsa.jni.ldflags>
 		<tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
 		<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
 		<tuxguitar-alsa.jni.library.name>tuxguitar-alsa-jni</tuxguitar-alsa.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml	2017-02-08 22:06:28.220720753 +0100
@@ -22,8 +22,8 @@
 		
 		<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
 		<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
-		<tuxguitar-alsa.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-alsa.jni.cflags>
-		<tuxguitar-alsa.jni.ldflags>-m32 -fPIC</tuxguitar-alsa.jni.ldflags>
+		<tuxguitar-alsa.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-alsa.jni.cflags>
+		<tuxguitar-alsa.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-alsa.jni.ldflags>
 		<tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
 		<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
 		<tuxguitar-alsa.jni.library.name>tuxguitar-alsa-jni</tuxguitar-alsa.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml	2017-02-08 22:06:28.220720753 +0100
@@ -22,8 +22,8 @@
 		
 		<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
 		<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
-		<tuxguitar-alsa.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-alsa.jni.cflags>
-		<tuxguitar-alsa.jni.ldflags>-m64 -fPIC</tuxguitar-alsa.jni.ldflags>
+		<tuxguitar-alsa.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-alsa.jni.cflags>
+		<tuxguitar-alsa.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-alsa.jni.ldflags>
 		<tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
 		<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
 		<tuxguitar-alsa.jni.library.name>tuxguitar-alsa-jni</tuxguitar-alsa.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-armv7hl/pom.xml	2017-02-08 22:06:28.220720753 +0100
@@ -24,8 +24,8 @@
 		<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
 		<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
 		<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
-		<tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-fluidsynth.jni.cflags>
-		<tuxguitar-fluidsynth.jni.ldflags>-fPIC</tuxguitar-fluidsynth.jni.ldflags>
+		<tuxguitar-fluidsynth.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-fluidsynth.jni.cflags>
+		<tuxguitar-fluidsynth.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-fluidsynth.jni.ldflags>
 		<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
 		<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
 		<tuxguitar-fluidsynth.jni.library.name>tuxguitar-fluidsynth-jni</tuxguitar-fluidsynth.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
 		<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
 		<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
 		<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
-		<tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-fluidsynth.jni.cflags>
-		<tuxguitar-fluidsynth.jni.ldflags>-m32 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
+		<tuxguitar-fluidsynth.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-fluidsynth.jni.cflags>
+		<tuxguitar-fluidsynth.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
 		<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
 		<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
 		<tuxguitar-fluidsynth.jni.library.name>tuxguitar-fluidsynth-jni</tuxguitar-fluidsynth.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
 		<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
 		<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
 		<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
-		<tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-fluidsynth.jni.cflags>
-		<tuxguitar-fluidsynth.jni.ldflags>-m64 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
+		<tuxguitar-fluidsynth.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-fluidsynth.jni.cflags>
+		<tuxguitar-fluidsynth.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-fluidsynth.jni.ldflags>
 		<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
 		<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
 		<tuxguitar-fluidsynth.jni.library.name>tuxguitar-fluidsynth-jni</tuxguitar-fluidsynth.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-armv7hl/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
 		<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
 		<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
 		<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
-		<tuxguitar-jack.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-jack.jni.cflags>
-		<tuxguitar-jack.jni.ldflags>-fPIC</tuxguitar-jack.jni.ldflags>
+		<tuxguitar-jack.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-jack.jni.cflags>
+		<tuxguitar-jack.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-jack.jni.ldflags>
 		<tuxguitar-jack.jni.ldlibs>`pkg-config --libs jack`</tuxguitar-jack.jni.ldlibs>
 		<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
 		<tuxguitar-jack.jni.library.name>tuxguitar-jack-jni</tuxguitar-jack.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
 		<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
 		<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
 		<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
-		<tuxguitar-jack.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-jack.jni.cflags>
-		<tuxguitar-jack.jni.ldflags>-m32 -fPIC</tuxguitar-jack.jni.ldflags>
+		<tuxguitar-jack.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-jack.jni.cflags>
+		<tuxguitar-jack.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-jack.jni.ldflags>
 		<tuxguitar-jack.jni.ldlibs>`pkg-config --libs jack`</tuxguitar-jack.jni.ldlibs>
 		<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
 		<tuxguitar-jack.jni.library.name>tuxguitar-jack-jni</tuxguitar-jack.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -24,8 +24,8 @@
 		<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
 		<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
 		<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
-		<tuxguitar-jack.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-jack.jni.cflags>
-		<tuxguitar-jack.jni.ldflags>-m64 -fPIC</tuxguitar-jack.jni.ldflags>
+		<tuxguitar-jack.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-jack.jni.cflags>
+		<tuxguitar-jack.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-jack.jni.ldflags>
 		<tuxguitar-jack.jni.ldlibs>`pkg-config --libs jack`</tuxguitar-jack.jni.ldlibs>
 		<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
 		<tuxguitar-jack.jni.library.name>tuxguitar-jack-jni</tuxguitar-jack.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-armv7hl/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -22,8 +22,8 @@
 		
 		<tuxguitar-oss.jni.path>${parent.relativePath}/TuxGuitar-oss/jni/</tuxguitar-oss.jni.path>
 		<tuxguitar-oss.jni.cc>${tuxguitar.jni.cc}</tuxguitar-oss.jni.cc>
-		<tuxguitar-oss.jni.cflags>-I$(shell gcj -print-file-name=include/) -fPIC</tuxguitar-oss.jni.cflags>
-		<tuxguitar-oss.jni.ldflags>-fPIC</tuxguitar-oss.jni.ldflags>
+		<tuxguitar-oss.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -fPIC</tuxguitar-oss.jni.cflags>
+		<tuxguitar-oss.jni.ldflags>${LDFLAGS} -fPIC</tuxguitar-oss.jni.ldflags>
 		<tuxguitar-oss.jni.ldlibs></tuxguitar-oss.jni.ldlibs>
 		<tuxguitar-oss.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-oss.jni.ldpath>
 		<tuxguitar-oss.jni.library.name>tuxguitar-oss-jni</tuxguitar-oss.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -22,8 +22,8 @@
 		
 		<tuxguitar-oss.jni.path>${parent.relativePath}/TuxGuitar-oss/jni/</tuxguitar-oss.jni.path>
 		<tuxguitar-oss.jni.cc>${tuxguitar.jni.cc}</tuxguitar-oss.jni.cc>
-		<tuxguitar-oss.jni.cflags>-I$(shell gcj -print-file-name=include/) -m32 -fPIC</tuxguitar-oss.jni.cflags>
-		<tuxguitar-oss.jni.ldflags>-m32 -fPIC</tuxguitar-oss.jni.ldflags>
+		<tuxguitar-oss.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m32 -fPIC</tuxguitar-oss.jni.cflags>
+		<tuxguitar-oss.jni.ldflags>${LDFLAGS} -m32 -fPIC</tuxguitar-oss.jni.ldflags>
 		<tuxguitar-oss.jni.ldlibs></tuxguitar-oss.jni.ldlibs>
 		<tuxguitar-oss.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-oss.jni.ldpath>
 		<tuxguitar-oss.jni.library.name>tuxguitar-oss-jni</tuxguitar-oss.jni.library.name>
diff -u -r tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml
--- tuxguitar-1.4-src/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml	2016-12-22 21:04:26.000000000 +0100
+++ tuxguitar-1.4-src-nogcj/build-scripts/native-modules/tuxguitar-oss-linux-x86_64/pom.xml	2017-02-08 22:06:28.224054080 +0100
@@ -22,8 +22,8 @@
 		
 		<tuxguitar-oss.jni.path>${parent.relativePath}/TuxGuitar-oss/jni/</tuxguitar-oss.jni.path>
 		<tuxguitar-oss.jni.cc>${tuxguitar.jni.cc}</tuxguitar-oss.jni.cc>
-		<tuxguitar-oss.jni.cflags>-I$(shell gcj -print-file-name=include/) -m64 -fPIC</tuxguitar-oss.jni.cflags>
-		<tuxguitar-oss.jni.ldflags>-m64 -fPIC</tuxguitar-oss.jni.ldflags>
+		<tuxguitar-oss.jni.cflags>${CFLAGS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -m64 -fPIC</tuxguitar-oss.jni.cflags>
+		<tuxguitar-oss.jni.ldflags>${LDFLAGS} -m64 -fPIC</tuxguitar-oss.jni.ldflags>
 		<tuxguitar-oss.jni.ldlibs></tuxguitar-oss.jni.ldlibs>
 		<tuxguitar-oss.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-oss.jni.ldpath>
 		<tuxguitar-oss.jni.library.name>tuxguitar-oss-jni</tuxguitar-oss.jni.library.name>