From 10cd3073c00ed2e0bd8f8922fa909a6d165d8644 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 12 Dec 2017 11:31:39 -0500 Subject: [PATCH] Update Types namespace --- Makefile.common | 5 ++++- src/love/Types/Audio/SoundData.cpp | 2 +- src/love/Types/Graphics/Color.cpp | 7 +++++-- src/love/Types/Graphics/Font.cpp | 2 +- src/love/Types/Graphics/Image.cpp | 2 +- src/love/Types/Graphics/Point.cpp | 7 +++++-- src/love/Types/Input/Joystick.cpp | 2 +- src/love/Types/System/Config.cpp | 2 +- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Makefile.common b/Makefile.common index e43fec8..8e1a790 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2,7 +2,10 @@ SOURCES_CXX += $(wildcard \ src/*.cpp \ src/love/*.cpp \ - src/love/*/*.cpp \ + src/love/Types/Audio/*.cpp \ + src/love/Types/Graphics/*.cpp \ + src/love/Types/Input/*.cpp \ + src/love/Types/System/*.cpp \ test/*.cpp \ ) diff --git a/src/love/Types/Audio/SoundData.cpp b/src/love/Types/Audio/SoundData.cpp index 7439cb7..d95d63f 100644 --- a/src/love/Types/Audio/SoundData.cpp +++ b/src/love/Types/Audio/SoundData.cpp @@ -1,7 +1,7 @@ #include "SoundData.h" #include -#include "../../ChaiLove.h" +#include "../../../ChaiLove.h" #include "AudioState.h" #include "physfs.h" diff --git a/src/love/Types/Graphics/Color.cpp b/src/love/Types/Graphics/Color.cpp index b0a63c2..7cfb7b8 100644 --- a/src/love/Types/Graphics/Color.cpp +++ b/src/love/Types/Graphics/Color.cpp @@ -3,6 +3,9 @@ namespace love { namespace Types { namespace Graphics { + // Nothing. -} -} + +} // namespace Graphics +} // namespace Types +} // namespace love diff --git a/src/love/Types/Graphics/Font.cpp b/src/love/Types/Graphics/Font.cpp index c822749..cf551bb 100644 --- a/src/love/Types/Graphics/Font.cpp +++ b/src/love/Types/Graphics/Font.cpp @@ -4,7 +4,7 @@ #include "SDL_ttf.h" #include #include -#include "../../ChaiLove.h" +#include "../../../ChaiLove.h" #include "Image.h" #include diff --git a/src/love/Types/Graphics/Image.cpp b/src/love/Types/Graphics/Image.cpp index 57ac7fb..c55ca08 100644 --- a/src/love/Types/Graphics/Image.cpp +++ b/src/love/Types/Graphics/Image.cpp @@ -5,7 +5,7 @@ #include #include -#include "../../ChaiLove.h" +#include "../../../ChaiLove.h" namespace love { diff --git a/src/love/Types/Graphics/Point.cpp b/src/love/Types/Graphics/Point.cpp index 8bf9beb..e9b8dc7 100644 --- a/src/love/Types/Graphics/Point.cpp +++ b/src/love/Types/Graphics/Point.cpp @@ -3,6 +3,9 @@ namespace love { namespace Types { namespace Graphics { + // Nothing. -} -} + +} // namespace Graphics +} // namespace Types +} // namespace love diff --git a/src/love/Types/Input/Joystick.cpp b/src/love/Types/Input/Joystick.cpp index a42d8a2..cf9fd3b 100644 --- a/src/love/Types/Input/Joystick.cpp +++ b/src/love/Types/Input/Joystick.cpp @@ -1,6 +1,6 @@ #include "Joystick.h" #include "SDL.h" -#include "../../ChaiLove.h" +#include "../../../ChaiLove.h" #include namespace love { diff --git a/src/love/Types/System/Config.cpp b/src/love/Types/System/Config.cpp index 6d84d05..1180978 100644 --- a/src/love/Types/System/Config.cpp +++ b/src/love/Types/System/Config.cpp @@ -1,5 +1,5 @@ #include "Config.h" -#include "../../ChaiLove.h" +#include "../../../ChaiLove.h" namespace love { namespace Types {