Update header guards to avoid conflicts

graysonpike · graysonpike · commit 7480a206631a · 2024-02-26T17:44:32.000-05:00
diff --git a/audio/audio.h b/audio/audio.h
@@ -1,12 +1,12 @@
-#ifndef AUDIO_H
-#define AUDIO_H
+#ifndef SDLGL_AUDIO_H
+#define SDLGL_AUDIO_H
 
 // Disable the miniaudio Device API, we are using SDL Audio as our device
-#define MA_NO_DEVICE_IO
+#define SDLGL_MA_NO_DEVICE_IO
 #include "../dependencies/miniaudio.h"
 
-#define CHANNELS 2
-#define SAMPLE_RATE 48000
+#define SDLGL_CHANNELS 2
+#define SDLGL_SAMPLE_RATE 48000
 
 #include "SDL.h"
 
diff --git a/audio/sound.h b/audio/sound.h
@@ -1,5 +1,5 @@
-#ifndef SOUND_H
-#define SOUND_H
+#ifndef SDLGL_SOUND_H
+#define SDLGL_SOUND_H
 
 #include <memory>
 #include <vector>
diff --git a/collision/collider.h b/collision/collider.h
@@ -1,5 +1,5 @@
-#ifndef COLLIDER_H
-#define COLLIDER_H
+#ifndef SDLGL_COLLIDER_H
+#define SDLGL_COLLIDER_H
 
 #include <functional>
 #include <vector>
diff --git a/collision/hitbox.h b/collision/hitbox.h
@@ -1,5 +1,5 @@
-#ifndef HITBOX_H
-#define HITBOX_H
+#ifndef SDLGL_HITBOX_H
+#define SDLGL_HITBOX_H
 
 #include <memory>
 
diff --git a/game/clock.h b/game/clock.h
@@ -1,5 +1,5 @@
-#ifndef CLOCK_H
-#define CLOCK_H
+#ifndef SDLGL_CLOCK_H
+#define SDLGL_CLOCK_H
 
 // Keeps track of 'delta' times between frames
 class Clock {
diff --git a/game/context.h b/game/context.h
@@ -1,5 +1,5 @@
-#ifndef CONTEXT_H
-#define CONTEXT_H
+#ifndef SDLGL_CONTEXT_H
+#define SDLGL_CONTEXT_H
 
 #include "../audio/audio.h"
 #include "../graphics/graphics.h"
diff --git a/game/entity.h b/game/entity.h
@@ -1,5 +1,5 @@
-#ifndef ENTITY_H
-#define ENTITY_H
+#ifndef SDLGL_ENTITY_H
+#define SDLGL_ENTITY_H
 
 #include <memory>
 
diff --git a/game/physical_entity.h b/game/physical_entity.h
@@ -1,5 +1,5 @@
-#ifndef PHYSICAL_ENTITY_H
-#define PHYSICAL_ENTITY_H
+#ifndef SDLGL_PHYSICAL_ENTITY_H
+#define SDLGL_PHYSICAL_ENTITY_H
 
 #include "entity.h"
 
diff --git a/game/scene.h b/game/scene.h
@@ -1,5 +1,5 @@
-#ifndef SCENE_H
-#define SCENE_H
+#ifndef SDLGL_SCENE_H
+#define SDLGL_SCENE_H
 
 #include <unordered_map>
 #include <vector>
diff --git a/game/timer.h b/game/timer.h
@@ -1,5 +1,5 @@
-#ifndef TIMER_H
-#define TIMER_H
+#ifndef SDLGL_TIMER_H
+#define SDLGL_TIMER_H
 
 class Timer {
     unsigned int start_time;
diff --git a/graphics/character.cpp b/graphics/character.cpp
diff --git a/graphics/character.h b/graphics/character.h
diff --git a/graphics/effects/emitter.h b/graphics/effects/emitter.h
@@ -1,5 +1,5 @@
-#ifndef PARTICLE_EMITTER_H
-#define PARTICLE_EMITTER_H
+#ifndef SDLGL_PARTICLE_EMITTER_H
+#define SDLGL_PARTICLE_EMITTER_H
 
 #include "../../game/physical_entity.h"
 #include "particle.h"
diff --git a/graphics/effects/linear_emitter.h b/graphics/effects/linear_emitter.h
@@ -1,5 +1,5 @@
-#ifndef LINEAR_PARTICLE_EMITTER_H
-#define LINEAR_PARTICLE_EMITTER_H
+#ifndef SDLGL_LINEAR_PARTICLE_EMITTER_H
+#define SDLGL_LINEAR_PARTICLE_EMITTER_H
 
 #include <utility>
 
diff --git a/graphics/effects/linear_particle.h b/graphics/effects/linear_particle.h
@@ -1,5 +1,5 @@
-#ifndef LINEAR_PARTICLE_H
-#define LINEAR_PARTICLE_H
+#ifndef SDLGL_LINEAR_PARTICLE_H
+#define SDLGL_LINEAR_PARTICLE_H
 
 #include "particle.h"
 
diff --git a/graphics/effects/particle.h b/graphics/effects/particle.h
@@ -1,5 +1,5 @@
-#ifndef PARTICLE_H
-#define PARTICLE_H
+#ifndef SDLGL_PARTICLE_H
+#define SDLGL_PARTICLE_H
 
 #include "../../game/physical_entity.h"
 #include "../../game/timer.h"
diff --git a/graphics/fps_counter.h b/graphics/fps_counter.h
@@ -1,9 +1,9 @@
-#ifndef FPS_COUNTER_H
-#define FPS_COUNTER_H
+#ifndef SDLGL_FPS_COUNTER_H
+#define SDLGL_FPS_COUNTER_H
 
-#define NUM_FRAMES_SAMPLED (10)
+#define SDLGL_NUM_FRAMES_SAMPLED (10)
 // Interval in seconds before updating FPS calculation
-#define UPDATE_DELAY (0.25f)
+#define SDLGL_UPDATE_DELAY (0.25f)
 
 class FPSCounter {
     float frame_times[NUM_FRAMES_SAMPLED];
diff --git a/graphics/graphics.h b/graphics/graphics.h
@@ -1,5 +1,5 @@
-#ifndef GRAPHICS_H
-#define GRAPHICS_H
+#ifndef SDLGL_GRAPHICS_H
+#define SDLGL_GRAPHICS_H
 
 #include <string>
 #include <vector>
diff --git a/graphics/offset.h b/graphics/offset.h
@@ -1,5 +1,5 @@
-#ifndef SPRITE_OFFSET_H
-#define SPRITE_OFFSET_H
+#ifndef SDLGL_SPRITE_OFFSET_H
+#define SDLGL_SPRITE_OFFSET_H
 
 struct Offset {
     int x;
diff --git a/graphics/resources.h b/graphics/resources.h
@@ -1,5 +1,5 @@
-#ifndef RESOURCES_H
-#define RESOURCES_H
+#ifndef SDLGL_RESOURCES_H
+#define SDLGL_RESOURCES_H
 
 #include <map>
 #include <string>
diff --git a/graphics/sprite.h b/graphics/sprite.h
@@ -1,5 +1,5 @@
-#ifndef SPRITE_H
-#define SPRITE_H
+#ifndef SDLGL_SPRITE_H
+#define SDLGL_SPRITE_H
 
 #include <vector>
 
diff --git a/graphics/text.h b/graphics/text.h
@@ -1,5 +1,5 @@
-#ifndef TEXT_H
-#define TEXT_H
+#ifndef SDLGL_TEXT_H
+#define SDLGL_TEXT_H
 
 #include <string>
 
diff --git a/graphics/texture.h b/graphics/texture.h
@@ -1,5 +1,5 @@
-#ifndef TEXTURE_H
-#define TEXTURE_H
+#ifndef SDLGL_TEXTURE_H
+#define SDLGL_TEXTURE_H
 
 #include <vector>
 
diff --git a/graphics/tilemap.h b/graphics/tilemap.h
@@ -1,5 +1,5 @@
-#ifndef TILEMAP_H
-#define TILEMAP_H
+#ifndef SDLGL_TILEMAP_H
+#define SDLGL_TILEMAP_H
 
 #include <vector>
 
diff --git a/graphics/tileset.h b/graphics/tileset.h
@@ -1,5 +1,5 @@
-#ifndef TILESET_H
-#define TILESET_H
+#ifndef SDLGL_TILESET_H
+#define SDLGL_TILESET_H
 
 #include <map>
 
diff --git a/input/inputs.h b/input/inputs.h
@@ -1,9 +1,9 @@
-#ifndef INPUTS_H
-#define INPUTS_H
+#ifndef SDLGL_INPUTS_H
+#define SDLGL_INPUTS_H
 
 #include "SDL.h"
 
-#define NUM_KEYS 2014
+#define SDLGL_NUM_KEYS 2014
 
 class Inputs {
     bool quit;
diff --git a/ui/entity_count.h b/ui/entity_count.h
@@ -1,5 +1,5 @@
-#ifndef ENTITY_COUNT_H
-#define ENTITY_COUNT_H
+#ifndef SDLGL_ENTITY_COUNT_H
+#define SDLGL_ENTITY_COUNT_H
 
 #include <string>
 
diff --git a/ui/fps_display.h b/ui/fps_display.h
@@ -1,5 +1,5 @@
-#ifndef FPS_DISPLAY_H
-#define FPS_DISPLAY_H
+#ifndef SDLGL_FPS_DISPLAY_H
+#define SDLGL_FPS_DISPLAY_H
 
 #include <string>
 
diff --git a/utilities/math.h b/utilities/math.h
@@ -1,5 +1,5 @@
-#ifndef UTILMATH_H
-#define UTILMATH_H
+#ifndef SDLGL_UTILMATH_H
+#define SDLGL_UTILMATH_H
 
 #include <utility>
 
diff --git a/utilities/noise.h b/utilities/noise.h
@@ -1,5 +1,5 @@
-#ifndef NOISE_H
-#define NOISE_H
+#ifndef SDLGL_NOISE_H
+#define SDLGL_NOISE_H
 
 #include <array>
 
diff --git a/utilities/random.h b/utilities/random.h
@@ -1,5 +1,5 @@
-#ifndef RANDOM_H
-#define RANDOM_H
+#ifndef SDLGL_RANDOM_H
+#define SDLGL_RANDOM_H
 
 #include <random>
 
