From: outfrost <kotlet.bahn@gmail.com>
Date: Mon, 1 Jun 2020 00:04:33 +0000 (+0200)
Subject: Declare variables extern in headers
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=59a4bb2a2008b5052b0860ae9a570913244f9857;p=shadowclad.git

Declare variables extern in headers

Fixes linkage errors on GCC 10
---

diff --git a/src/engine/logger.h b/src/engine/logger.h
index bd171b9..d491f8a 100644
--- 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 4fd0f41..25ea9be 100644
--- 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 71c5912..f603c14 100644
--- 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 6d685ef..4d6992e 100644
--- 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 d534e8e..1844069 100644
--- 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);