Hi
Rather mechanical fix for -fno-common. Builds and starts, but I don't
know how to play it, so can't judge if that works.
Best,
Martin
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 26 Feb 2021 18:20:33 -0000 1.24
+++ Makefile 6 Mar 2021 18:01:30 -0000
@@ -3,7 +3,7 @@
COMMENT= space combat and trading game in the style of Elite
VERSION= 1.73.4
-REVISION = 16
+REVISION = 17
DISTNAME= oolite-dev-source-${VERSION}
PKGNAME= oolite-${VERSION}
CATEGORIES= games
Index: patches/patch-src_Cocoa_JoystickHandler.h
===================================================================
RCS file: patches/patch-src_Cocoa_JoystickHandler.h
diff -N patches/patch-src_Cocoa_JoystickHandler.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Cocoa_JoystickHandler.h 6 Mar 2021 18:01:30 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/Cocoa/JoystickHandler.h Sat Mar 6 18:11:04 2021
++++ src/Cocoa/JoystickHandler.h Sat Mar 6 18:20:16 2021
+@@ -66,7 +66,7 @@
+ AXIS_VIEWX,
+ AXIS_VIEWY,
+ AXIS_end
+-} axfn;
++};
+
+ // Controls that can be a button
+ enum {
+@@ -102,7 +102,7 @@
+ BUTTON_VIEWPORT,
+ BUTTON_VIEWSTARBOARD,
+ BUTTON_end
+-} butfn;
++};
+
+ // Stick constants
+ #define MAX_STICKS 4
Index: patches/patch-src_Core_Entities_PlanetEntity_h
===================================================================
RCS file:
/cvs/ports/games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Core_Entities_PlanetEntity_h
--- patches/patch-src_Core_Entities_PlanetEntity_h 22 Oct 2013 16:52:09
-0000 1.1
+++ patches/patch-src_Core_Entities_PlanetEntity_h 6 Mar 2021 18:01:30
-0000
@@ -6,9 +6,9 @@ $OpenBSD: patch-src_Core_Entities_Planet
} VertexData;
+// straight c
-+double corona_speed_factor; // multiply delta_t by this
before adding it to corona_stage
-+double corona_stage; // 0.0 -> 1.0
-+GLfloat rvalue[729]; // stores random values
for adjusting colors in the corona
++extern double corona_speed_factor; // multiply delta_t by this
before adding it to corona_stage
++extern double corona_stage; // 0.0 -> 1.0
++extern GLfloat rvalue[729]; // stores
random values for adjusting colors in the corona
+
+
@interface PlanetEntity: OOSelfDrawingEntity
Index: patches/patch-src_Core_Entities_PlanetEntity_m
===================================================================
RCS file: patches/patch-src_Core_Entities_PlanetEntity_m
diff -N patches/patch-src_Core_Entities_PlanetEntity_m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Core_Entities_PlanetEntity_m 6 Mar 2021 18:01:30
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/Core/Entities/PlanetEntity.m Sat Mar 6 18:11:04 2021
++++ src/Core/Entities/PlanetEntity.m Sat Mar 6 18:34:07 2021
+@@ -44,6 +44,10 @@
+ #define LIM8K 8000.0*8000.0 *
NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
+ #define LIM16K 16000.0*16000.0 *
NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
+
++// -fno-common
++double corona_speed_factor;
++double corona_stage;
++GLfloat rvalue[729];
+
+ // straight c
+ static Vector base_vertex_array[10400];
Index: patches/patch-src_Core_OOTrumble_h
===================================================================
RCS file: patches/patch-src_Core_OOTrumble_h
diff -N patches/patch-src_Core_OOTrumble_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Core_OOTrumble_h 6 Mar 2021 18:01:30 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Core/OOTrumble.h Sat Mar 6 18:11:04 2021
++++ src/Core/OOTrumble.h Sat Mar 6 18:30:37 2021
+@@ -66,7 +66,7 @@
+ TRUMBLE_MOUTH_NORMAL
+ };
+
+-float trumbleAppetiteAccumulator;
++extern float trumbleAppetiteAccumulator;
+
+ @interface OOTrumble : NSObject
+ {
Index: patches/patch-src_Core_OOTrumble_m
===================================================================
RCS file: patches/patch-src_Core_OOTrumble_m
diff -N patches/patch-src_Core_OOTrumble_m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Core_OOTrumble_m 6 Mar 2021 18:01:30 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Core/OOTrumble.m Sat Mar 6 18:11:04 2021
++++ src/Core/OOTrumble.m Sat Mar 6 18:30:49 2021
+@@ -30,6 +30,8 @@
+ #import "OOSound.h"
+ #import "OOStringParsing.h"
+
++// -fno-common
++float trumbleAppetiteAccumulator;
+
+ static void InitTrumbleSounds(void);
+ static void PlayTrumbleIdle(void);
Index: patches/patch-src_SDL_JoystickHandler_h
===================================================================
RCS file: patches/patch-src_SDL_JoystickHandler_h
diff -N patches/patch-src_SDL_JoystickHandler_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_SDL_JoystickHandler_h 6 Mar 2021 18:01:30 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/SDL/JoystickHandler.h Sat Mar 6 18:11:04 2021
++++ src/SDL/JoystickHandler.h Sat Mar 6 18:28:27 2021
+@@ -46,7 +46,7 @@
+ AXIS_VIEWX,
+ AXIS_VIEWY,
+ AXIS_end
+-} axfn;
++};
+
+ // Controls that can be a button
+ enum {
+@@ -82,7 +82,7 @@
+ BUTTON_VIEWPORT,
+ BUTTON_VIEWSTARBOARD,
+ BUTTON_end
+-} butfn;
++};
+
+ // Stick constants
+ #define MAX_STICKS 2
