build fix

jmorton06 · Jun 25, 2024 · b6e2f24 · b6e2f24
1 parent 196e920
commit b6e2f24
Show file tree

Hide file tree

Showing 195 changed files with 52 additions and 389 deletions.
diff --git a/Lumos/Source/Lumos/AI/AStar.cpp b/Lumos/Source/Lumos/AI/AStar.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "AStar.h"
 #include "PathEdge.h"
 

diff --git a/Lumos/Source/Lumos/AI/PathEdge.cpp b/Lumos/Source/Lumos/AI/PathEdge.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "PathEdge.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/AI/PathNode.cpp b/Lumos/Source/Lumos/AI/PathNode.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "PathNode.h"
 #include "PathEdge.h"
 

diff --git a/Lumos/Source/Lumos/Audio/AudioManager.cpp b/Lumos/Source/Lumos/Audio/AudioManager.cpp
@@ -1,6 +1,6 @@
-#ifndef LUMOS_PLATFORM_MACOS
+//#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
+//#endif
 #include "AudioManager.h"
 #include "Core/Application.h"
 #include "Scene/Scene.h"

diff --git a/Lumos/Source/Lumos/Audio/OggLoader.cpp b/Lumos/Source/Lumos/Audio/OggLoader.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "OggLoader.h"
 #include "Core/OS/FileSystem.h"
 #include "Sound.h"

diff --git a/Lumos/Source/Lumos/Audio/Sound.cpp b/Lumos/Source/Lumos/Audio/Sound.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Sound.h"
 #include "Core/OS/FileSystem.h"
 

diff --git a/Lumos/Source/Lumos/Audio/SoundNode.cpp b/Lumos/Source/Lumos/Audio/SoundNode.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "SoundNode.h"
 #include "Maths/MathsUtilities.h"
 

diff --git a/Lumos/Source/Lumos/Audio/WavLoader.cpp b/Lumos/Source/Lumos/Audio/WavLoader.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "WavLoader.h"
 #include <fstream>
 

diff --git a/Lumos/Source/Lumos/Core/Application.cpp b/Lumos/Source/Lumos/Core/Application.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Application.h"
 
 #include "Scene/Scene.h"

diff --git a/Lumos/Source/Lumos/Core/Asset/AssetManager.cpp b/Lumos/Source/Lumos/Core/Asset/AssetManager.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "AssetManager.h"
 #include "AssetRegistry.h"
 #include "Core/Application.h"

diff --git a/Lumos/Source/Lumos/Core/Asset/AssetRegistry.cpp b/Lumos/Source/Lumos/Core/Asset/AssetRegistry.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "AssetRegistry.h"
 #include "Asset.h"
 

diff --git a/Lumos/Source/Lumos/Core/CommandLine.cpp b/Lumos/Source/Lumos/Core/CommandLine.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "CommandLine.h"
 #include "Maths/MathsUtilities.h"
 #include "Core/Thread.h"

diff --git a/Lumos/Source/Lumos/Core/CoreSystem.cpp b/Lumos/Source/Lumos/Core/CoreSystem.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "CoreSystem.h"
 #include "OS/FileSystem.h"
 #include "JobSystem.h"

diff --git a/Lumos/Source/Lumos/Core/DataStructures/Map.cpp b/Lumos/Source/Lumos/Core/DataStructures/Map.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Map.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/Engine.cpp b/Lumos/Source/Lumos/Core/Engine.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Engine.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/JobSystem.cpp b/Lumos/Source/Lumos/Core/JobSystem.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "JobSystem.h"
 #include "Maths/MathsUtilities.h"
 #include "Core/DataStructures/TDArray.h"

diff --git a/Lumos/Source/Lumos/Core/LMLog.cpp b/Lumos/Source/Lumos/Core/LMLog.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "LMLog.h"
 
 #include <spdlog/sinks/rotating_file_sink.h>

diff --git a/Lumos/Source/Lumos/Core/LMLog.h b/Lumos/Source/Lumos/Core/LMLog.h
@@ -14,10 +14,6 @@
 #endif
 #endif
 
-#ifndef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY
-#endif
-
 #include <spdlog/spdlog.h>
 #include <spdlog/fmt/ostr.h>
 

diff --git a/Lumos/Source/Lumos/Core/OS/Allocators/BinAllocator.cpp b/Lumos/Source/Lumos/Core/OS/Allocators/BinAllocator.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "BinAllocator.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/OS/Allocators/DefaultAllocator.cpp b/Lumos/Source/Lumos/Core/OS/Allocators/DefaultAllocator.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "DefaultAllocator.h"
 
 #include "Core/OS/MemoryManager.h"

diff --git a/Lumos/Source/Lumos/Core/OS/Allocators/StbAllocator.cpp b/Lumos/Source/Lumos/Core/OS/Allocators/StbAllocator.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "StbAllocator.h"
 
 #define STB_LEAKCHECK_IMPLEMENTATION

diff --git a/Lumos/Source/Lumos/Core/OS/FileSystem.cpp b/Lumos/Source/Lumos/Core/OS/FileSystem.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "FileSystem.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/OS/Input.cpp b/Lumos/Source/Lumos/Core/OS/Input.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Input.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/OS/Memory.cpp b/Lumos/Source/Lumos/Core/OS/Memory.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Memory.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/OS/MemoryManager.cpp b/Lumos/Source/Lumos/Core/OS/MemoryManager.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "MemoryManager.h"
 #include "Utilities/StringUtilities.h"
 

diff --git a/Lumos/Source/Lumos/Core/OS/OS.cpp b/Lumos/Source/Lumos/Core/OS/OS.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "OS.h"
 
 #if defined(LUMOS_PLATFORM_WINDOWS)

diff --git a/Lumos/Source/Lumos/Core/OS/Window.cpp b/Lumos/Source/Lumos/Core/OS/Window.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Window.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/Reference.cpp b/Lumos/Source/Lumos/Core/Reference.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Reference.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/String.cpp b/Lumos/Source/Lumos/Core/String.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "String.h"
 #include <cstdarg>
 

diff --git a/Lumos/Source/Lumos/Core/Thread.cpp b/Lumos/Source/Lumos/Core/Thread.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Thread.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Core/UUID.cpp b/Lumos/Source/Lumos/Core/UUID.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "UUID.h"
 #include "Maths/Random.h"
 

diff --git a/Lumos/Source/Lumos/Embedded/EmbedAsset.cpp b/Lumos/Source/Lumos/Embedded/EmbedAsset.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "EmbedAsset.h"
 #include "Graphics/RHI/Texture.h"
 #include "Graphics/RHI/Shader.h"

diff --git a/Lumos/Source/Lumos/Graphics/AnimatedSprite.cpp b/Lumos/Source/Lumos/Graphics/AnimatedSprite.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "AnimatedSprite.h"
 
 namespace Lumos::Graphics

diff --git a/Lumos/Source/Lumos/Graphics/Animation/Animation.cpp b/Lumos/Source/Lumos/Graphics/Animation/Animation.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Animation.h"
 #include "Skeleton.h"
 

diff --git a/Lumos/Source/Lumos/Graphics/Animation/AnimationController.cpp b/Lumos/Source/Lumos/Graphics/Animation/AnimationController.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Skeleton.h"
 #include "AnimationController.h"
 #include "SamplingContext.h"

diff --git a/Lumos/Source/Lumos/Graphics/Animation/SamplingContext.cpp b/Lumos/Source/Lumos/Graphics/Animation/SamplingContext.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "SamplingContext.h"
 
 namespace Lumos

diff --git a/Lumos/Source/Lumos/Graphics/Animation/Skeleton.cpp b/Lumos/Source/Lumos/Graphics/Animation/Skeleton.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Skeleton.h"
 #include <glm/gtc/type_ptr.hpp>
 

diff --git a/Lumos/Source/Lumos/Graphics/Camera/Camera.cpp b/Lumos/Source/Lumos/Graphics/Camera/Camera.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Camera.h"
 #include <glm/gtc/matrix_transform.hpp>
 

diff --git a/Lumos/Source/Lumos/Graphics/Camera/Camera2D.cpp b/Lumos/Source/Lumos/Graphics/Camera/Camera2D.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Camera2D.h"
 #include "Core/OS/Input.h"
 #include "Maths/MathsUtilities.h"

diff --git a/Lumos/Source/Lumos/Graphics/Camera/EditorCamera.cpp b/Lumos/Source/Lumos/Graphics/Camera/EditorCamera.cpp
@@ -1,9 +1,5 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "EditorCamera.h"
 #include "Graphics/Camera/Camera.h"
 #include "Core/Application.h"

diff --git a/Lumos/Source/Lumos/Graphics/Camera/FPSCamera.cpp b/Lumos/Source/Lumos/Graphics/Camera/FPSCamera.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "FPSCamera.h"
 #include "Core/Application.h"
 #include "Core/OS/Input.h"

diff --git a/Lumos/Source/Lumos/Graphics/Camera/ThirdPersonCamera.cpp b/Lumos/Source/Lumos/Graphics/Camera/ThirdPersonCamera.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "ThirdPersonCamera.h"
 #include "Core/OS/Input.h"
 #include "Camera.h"

diff --git a/Lumos/Source/Lumos/Graphics/Environment.cpp b/Lumos/Source/Lumos/Graphics/Environment.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Environment.h"
 #include "Core/Application.h"
 #include "Renderers/SceneRenderer.h"

diff --git a/Lumos/Source/Lumos/Graphics/Font.cpp b/Lumos/Source/Lumos/Graphics/Font.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Font.h"
 #include "MSDFData.h"
 #include "Core/OS/FileSystem.h"

diff --git a/Lumos/Source/Lumos/Graphics/Light.cpp b/Lumos/Source/Lumos/Graphics/Light.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Light.h"
 
 #include "ImGui/ImGuiUtilities.h"

diff --git a/Lumos/Source/Lumos/Graphics/Material.cpp b/Lumos/Source/Lumos/Graphics/Material.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Material.h"
 #include "Graphics/RHI/Shader.h"
 #include "Graphics/RHI/Texture.h"

diff --git a/Lumos/Source/Lumos/Graphics/Mesh.cpp b/Lumos/Source/Lumos/Graphics/Mesh.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Mesh.h"
 #include "RHI/Renderer.h"
 #include "RHI/VertexBuffer.h"

diff --git a/Lumos/Source/Lumos/Graphics/MeshFactory.cpp b/Lumos/Source/Lumos/Graphics/MeshFactory.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "MeshFactory.h"
 #include "Mesh.h"
 #include "Material.h"

diff --git a/Lumos/Source/Lumos/Graphics/Model.cpp b/Lumos/Source/Lumos/Graphics/Model.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Model.h"
 #include "Mesh.h"
 #include "Material.h"

diff --git a/Lumos/Source/Lumos/Graphics/ModelLoader/FBXLoader.cpp b/Lumos/Source/Lumos/Graphics/ModelLoader/FBXLoader.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Graphics/Model.h"
 #include "Graphics/Mesh.h"
 #include "Graphics/Material.h"

diff --git a/Lumos/Source/Lumos/Graphics/ModelLoader/GLTFLoader.cpp b/Lumos/Source/Lumos/Graphics/ModelLoader/GLTFLoader.cpp
@@ -3,9 +3,7 @@
 #undef __OPTIMIZE__
 #endif
 
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Graphics/Model.h"
 #include "Graphics/Mesh.h"
 #include "Graphics/Material.h"

diff --git a/Lumos/Source/Lumos/Graphics/ModelLoader/OBJLoader.cpp b/Lumos/Source/Lumos/Graphics/ModelLoader/OBJLoader.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "Graphics/Model.h"
 #include "Graphics/Mesh.h"
 #include "Graphics/Material.h"

diff --git a/Lumos/Source/Lumos/Graphics/ParticleManager.cpp b/Lumos/Source/Lumos/Graphics/ParticleManager.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "ParticleManager.h"
 #include "Maths/Random.h"
 #include "Maths/MathsUtilities.h"

diff --git a/Lumos/Source/Lumos/Graphics/RHI/BufferLayout.cpp b/Lumos/Source/Lumos/Graphics/RHI/BufferLayout.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "BufferLayout.h"
 
 #include "GraphicsContext.h"

diff --git a/Lumos/Source/Lumos/Graphics/RHI/CommandBuffer.cpp b/Lumos/Source/Lumos/Graphics/RHI/CommandBuffer.cpp
@@ -1,6 +1,4 @@
-#ifndef LUMOS_PLATFORM_MACOS
 #include "Precompiled.h"
-#endif
 #include "CommandBuffer.h"
 
 namespace Lumos