summarylogtreecommitdiffstats
path: root/gcc-10-multiple-definition-fix.patch
blob: 41ed644a4319745c169c7ab8ce293ea57da64316 (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
diff --git a/src/opengl.h b/src/opengl.h
index c5262be..cdbfb6d 100644
--- a/src/opengl.h
+++ b/src/opengl.h
@@ -14,6 +14,8 @@
 #define OPENGL_COLOR0_ATTRIB_BITINDEX (1 << OPENGL_COLOR0_ATTRIB_INDEX)
 #define OPENGL_COLOR1_ATTRIB_BITINDEX (1 << OPENGL_COLOR1_ATTRIB_INDEX)
 
+extern int WaterFallBase;
+
 enum AVP_SHADER_PROGRAM {
        AVP_SHADER_PROGRAM_DEFAULT,
        AVP_SHADER_PROGRAM_NO_SECONDARY,
diff --git a/src/stubs.c b/src/stubs.c
index 714fd7f..0ebc338 100644
--- a/src/stubs.c
+++ b/src/stubs.c
@@ -109,7 +109,6 @@ void ReloadImageIntoD3DImmediateSurface(IMAGEHEADER* iheader)
 int NumberOfLandscapePolygons;
 int FMVParticleColour;
 int WireFrameMode;
-int WaterFallBase;
 
 void InitDrawTest()
 {