Declare variables extern in headers

Fixes linkage errors on GCC 10

diff --git a/src/engine/logger.h b/src/engine/logger.h
index bd171b9dbc6c383c5abcfeb8dbb81860d540ed75..d491f8abbe378e2f628b441f8ffd4fd015fced70 100644 (file)
--- a/src/engine/logger.h
+++ b/src/engine/logger.h
@@ -8,7 +8,7 @@ typedef enum {
        LOGLEVEL_DEBUG
 } LogLevel;
 
-LogLevel logLevel;
+extern LogLevel logLevel;
 
 #define logError(...) logMessage(LOGLEVEL_ERROR, __func__, __VA_ARGS__)
 #define logWarning(...) logMessage(LOGLEVEL_WARNING, __func__, __VA_ARGS__)

diff --git a/src/engine/render.h b/src/engine/render.h
index 4fd0f413b2bf6e82613c9fd430ce186dfde876e5..25ea9beccbf548ef21a2a799e5221011d7f58f02 100644 (file)
--- a/src/engine/render.h
+++ b/src/engine/render.h
@@ -3,8 +3,8 @@
 
 #include "scene.h"
 
-float viewportAspectRatio;
-const Scene* cameraAnchor;
+extern float viewportAspectRatio;
+extern const Scene* cameraAnchor;
 
 void initRender();
 void renderFrame();

diff --git a/src/engine/scene.h b/src/engine/scene.h
index 71c5912fca20751dee446e8c97713d51108db0c8..f603c147ab0462616b3a9be19d3612c2e3e4931a 100644 (file)
--- a/src/engine/scene.h
+++ b/src/engine/scene.h
@@ -13,7 +13,7 @@ struct Scene {
        const Solid* solid;
 };
 
-Scene* currentScene;
+extern Scene* currentScene;
 
 Scene* newScene();
 void insertChildScene(Scene* scene, Scene* newChild);

diff --git a/src/game/level.h b/src/game/level.h
index 6d685ef1e70d6c4ba1c77e90c4a7ff8e1c2d08d6..4d6992ede5631eabcc79fb5190732e1ea75194d7 100644 (file)
--- a/src/game/level.h
+++ b/src/game/level.h
@@ -26,7 +26,7 @@ typedef struct {
 
 #define BLOCKGRID_CELL_SIZE 2.5f
 
-BlockGrid levelGrid;
+extern BlockGrid levelGrid;
 
 void initLevel();
 void startLevel();

diff --git a/src/game/player.h b/src/game/player.h
index d534e8ea65e72caab830b86be8b483cd8e5cdbc7..184406998c30e38c15819318b339133bf444b879 100644 (file)
--- a/src/game/player.h
+++ b/src/game/player.h
@@ -5,7 +5,7 @@
 
 #include "engine/scene.h"
 
-Scene* playerCharacter;
+extern Scene* playerCharacter;
 
 void initPlayer();
 void spawnPlayer(Transform transform);