*格式化代码

54 files changed, 63 insertions, 62 deletions

diff --git a/src/libjin/Audio/Audio.cpp b/src/libjin/Audio/Audio.cpp
index 6c68b35..928f01a 100644
--- a/src/libjin/Audio/Audio.cpp
+++ b/src/libjin/Audio/Audio.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
diff --git a/src/libjin/Audio/Audio.h b/src/libjin/Audio/Audio.h
index 5ba0844..fd391aa 100644
--- a/src/libjin/Audio/Audio.h
+++ b/src/libjin/Audio/Audio.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_AUDIO_H
 #define __LIBJIN_AUDIO_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
@@ -38,7 +38,7 @@ namespace jin
 				, state(State::PLAY)
 			{};
 			virtual ~Audio() {};
-			SINGLETON(Audio);
+			singleton(Audio);
 
 			float volume;
 			State state;
diff --git a/src/libjin/Audio/SDL/SDLAudio.cpp b/src/libjin/Audio/SDL/SDLAudio.cpp
index 6c341c0..96bb304 100644
--- a/src/libjin/Audio/SDL/SDLAudio.cpp
+++ b/src/libjin/Audio/SDL/SDLAudio.cpp
@@ -1,4 +1,4 @@
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
 #include <iostream>
diff --git a/src/libjin/Audio/SDL/SDLAudio.h b/src/libjin/Audio/SDL/SDLAudio.h
index 31022c6..1a29595 100644
--- a/src/libjin/Audio/SDL/SDLAudio.h
+++ b/src/libjin/Audio/SDL/SDLAudio.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_AUDIO_SDL_H
 #define __LIBJIN_AUDIO_SDL_H
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
 #include "SDLSource.h"
@@ -42,7 +42,7 @@ namespace jin
 			void unlock();
 
 		private:
-			SINGLETON(SDLAudio);
+			singleton(SDLAudio);
 			SDLAudio() {};
 			~SDLAudio() {};
 			/* subsystem interface */
diff --git a/src/libjin/Audio/SDL/SDLSource.cpp b/src/libjin/Audio/SDL/SDLSource.cpp
index fc22bbf..34fc0f5 100644
--- a/src/libjin/Audio/SDL/SDLSource.cpp
+++ b/src/libjin/Audio/SDL/SDLSource.cpp
@@ -1,4 +1,4 @@
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
 #include <exception>
diff --git a/src/libjin/Audio/SDL/SDLSource.h b/src/libjin/Audio/SDL/SDLSource.h
index df005a0..4977ec8 100644
--- a/src/libjin/Audio/SDL/SDLSource.h
+++ b/src/libjin/Audio/SDL/SDLSource.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_SOURCE_SDL_H
 #define __LIBJIN_SOURCE_SDL_H
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
 
 #include <vector>
diff --git a/src/libjin/Audio/Source.cpp b/src/libjin/Audio/Source.cpp
index 8da4cde..646e5ef 100644
--- a/src/libjin/Audio/Source.cpp
+++ b/src/libjin/Audio/Source.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include <cstring>
diff --git a/src/libjin/Audio/Source.h b/src/libjin/Audio/Source.h
index 07a9a4e..6dfc86c 100644
--- a/src/libjin/Audio/Source.h
+++ b/src/libjin/Audio/Source.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_AUDIO_SOURCE_H
 #define __LIBJIN_AUDIO_SOURCE_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
diff --git a/src/libjin/Common/Singleton.hpp b/src/libjin/Common/Singleton.hpp
index cdb395f..12b1450 100644
--- a/src/libjin/Common/Singleton.hpp
+++ b/src/libjin/Common/Singleton.hpp
@@ -30,7 +30,7 @@ namespace jin
 
     template<class T> T* Singleton<T>::_instance = nullptr;
 
-#define SINGLETON(T) friend Singleton<T>
+#define singleton(T) friend Singleton<T>
 
 } // namespace jin
 
diff --git a/src/libjin/Common/Subsystem.hpp b/src/libjin/Common/Subsystem.hpp
index b9ca88b..293b88d 100644
--- a/src/libjin/Common/Subsystem.hpp
+++ b/src/libjin/Common/Subsystem.hpp
@@ -28,7 +28,7 @@ namespace jin
         }
 
     protected:
-        SINGLETON(System);
+        singleton(System);
 
         Subsystem() {};
         virtual ~Subsystem() {};
diff --git a/src/libjin/Common/utf8.cpp b/src/libjin/Common/utf8.cpp
index 33ee128..b912a51 100644
--- a/src/libjin/Common/utf8.cpp
+++ b/src/libjin/Common/utf8.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_OS == LIBJIN_WINDOWS
 
 #include "utf8.h"
diff --git a/src/libjin/Common/utf8.h b/src/libjin/Common/utf8.h
index ae41728..9abb916 100644
--- a/src/libjin/Common/utf8.h
+++ b/src/libjin/Common/utf8.h
@@ -1,7 +1,7 @@
 #ifndef __LIBJIN_COMMON_UTF8_H
 #define __LIBJIN_COMMON_UTF8_H
 
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_OS == LIBJIN_WINDOWS
 
 #include <string>
diff --git a/src/libjin/Game/Game.h b/src/libjin/Game/Game.h
index c4a341f..c7607a1 100644
--- a/src/libjin/Game/Game.h
+++ b/src/libjin/Game/Game.h
@@ -38,7 +38,7 @@ namespace jin
 			Game();
 			~Game() {};
 
-			SINGLETON(Game);
+			singleton(Game);
         
 			onEvent  _onEvent; 
 			onUpdate _onUpdate;
diff --git a/src/libjin/Graphics/Bitmap.h b/src/libjin/Graphics/Bitmap.h
index c983676..bb30bdc 100644
--- a/src/libjin/Graphics/Bitmap.h
+++ b/src/libjin/Graphics/Bitmap.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_BITMAP_H
 #define __LIBJIN_BITMAP_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "../Math/Vector2.hpp"
diff --git a/src/libjin/Graphics/Canvas.cpp b/src/libjin/Graphics/Canvas.cpp
index 11b2d77..f222721 100644
--- a/src/libjin/Graphics/Canvas.cpp
+++ b/src/libjin/Graphics/Canvas.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "../utils/macros.h"
diff --git a/src/libjin/Graphics/Canvas.h b/src/libjin/Graphics/Canvas.h
index 935a65e..0a261a8 100644
--- a/src/libjin/Graphics/Canvas.h
+++ b/src/libjin/Graphics/Canvas.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_CANVAS_H
 #define __LIBJIN_CANVAS_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "drawable.h"
diff --git a/src/libjin/Graphics/Color.h b/src/libjin/Graphics/Color.h
index 6c49691..2a6feca 100644
--- a/src/libjin/Graphics/Color.h
+++ b/src/libjin/Graphics/Color.h
@@ -3,7 +3,7 @@
 */
 #ifndef __LIBJIN_COLOR_H
 #define __LIBJIN_COLOR_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "../utils/endian.h"
diff --git a/src/libjin/Graphics/Drawable.cpp b/src/libjin/Graphics/Drawable.cpp
index 947bb99..80a6cce 100644
--- a/src/libjin/Graphics/Drawable.cpp
+++ b/src/libjin/Graphics/Drawable.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "./Shader/Shader.h"
diff --git a/src/libjin/Graphics/Drawable.h b/src/libjin/Graphics/Drawable.h
index 31ee3c5..95af75e 100644
--- a/src/libjin/Graphics/Drawable.h
+++ b/src/libjin/Graphics/Drawable.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_DRAWABLE
 #define __LIBJIN_DRAWABLE
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "../math/Quad.h"
diff --git a/src/libjin/Graphics/Font/TTF.cpp b/src/libjin/Graphics/Font/TTF.cpp
index b90bbba..fe47630 100644
--- a/src/libjin/Graphics/Font/TTF.cpp
+++ b/src/libjin/Graphics/Font/TTF.cpp
@@ -1,4 +1,4 @@
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include <stdio.h>
diff --git a/src/libjin/Graphics/Font/TTF.h b/src/libjin/Graphics/Font/TTF.h
index 8e9ed73..88ddfd6 100644
--- a/src/libjin/Graphics/Font/TTF.h
+++ b/src/libjin/Graphics/Font/TTF.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJINTTF_H
 #define __LIBJIN_TTF_H
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include <vector>
diff --git a/src/libjin/Graphics/Graphics.h b/src/libjin/Graphics/Graphics.h
index a173599..68579e5 100644
--- a/src/libjin/Graphics/Graphics.h
+++ b/src/libjin/Graphics/Graphics.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_GRAPHICS_H
 #define __LIBJIN_GRAPHICS_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "canvas.h"
diff --git a/src/libjin/Graphics/Shader/Shader.cpp b/src/libjin/Graphics/Shader/Shader.cpp
index 163ba92..877ef5b 100644
--- a/src/libjin/Graphics/Shader/Shader.cpp
+++ b/src/libjin/Graphics/Shader/Shader.cpp
@@ -1,5 +1,5 @@
 #include <regex>
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include <iostream>
diff --git a/src/libjin/Graphics/Shader/Shader.h b/src/libjin/Graphics/Shader/Shader.h
index d1d843a..d91b539 100644
--- a/src/libjin/Graphics/Shader/Shader.h
+++ b/src/libjin/Graphics/Shader/Shader.h
@@ -1,7 +1,7 @@
 #ifndef __LIBJIN_SHADER_H
 #define __LIBJIN_SHADER_H
 
-#include "../../jin_configuration.h"
+#include "../../configuration.h"
 #if defined(jin_graphics) && defined(jin_graphics_shader)
 
 #include <string>
diff --git a/src/libjin/Graphics/Shapes.cpp b/src/libjin/Graphics/Shapes.cpp
index b99c569..69eda70 100644
--- a/src/libjin/Graphics/Shapes.cpp
+++ b/src/libjin/Graphics/Shapes.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "./Shader/Shader.h"
diff --git a/src/libjin/Graphics/Shapes.h b/src/libjin/Graphics/Shapes.h
index 61efcfe..07e7567 100644
--- a/src/libjin/Graphics/Shapes.h
+++ b/src/libjin/Graphics/Shapes.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_GEOMETRY_H
 #define __LIBJIN_GEOMETRY_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "color.h"
diff --git a/src/libjin/Graphics/Texture.cpp b/src/libjin/Graphics/Texture.cpp
index 4af29a7..226187d 100644
--- a/src/libjin/Graphics/Texture.cpp
+++ b/src/libjin/Graphics/Texture.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include <fstream>
diff --git a/src/libjin/Graphics/Texture.h b/src/libjin/Graphics/Texture.h
index 15fd78e..45f3f34 100644
--- a/src/libjin/Graphics/Texture.h
+++ b/src/libjin/Graphics/Texture.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_TEXTURE_H
 #define __LIBJIN_TEXTURE_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "../3rdparty/GLee/GLee.h"
diff --git a/src/libjin/Graphics/Window.cpp b/src/libjin/Graphics/Window.cpp
index 7f8f02d..1fd1f90 100644
--- a/src/libjin/Graphics/Window.cpp
+++ b/src/libjin/Graphics/Window.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include <iostream>
diff --git a/src/libjin/Graphics/Window.h b/src/libjin/Graphics/Window.h
index 5871562..8d6c4f5 100644
--- a/src/libjin/Graphics/Window.h
+++ b/src/libjin/Graphics/Window.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_RENDER_WINDOW
 #define __LIBJIN_RENDER_WINDOW
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_RENDER
 
 #include "SDL2/SDL.h"
@@ -34,7 +34,8 @@ namespace jin
 			void swapBuffers();
 
 		private:
-			SINGLETON(Window);
+            // declare a singleton 
+			singleton(Window);
 
 			Window() {};
 
diff --git a/src/libjin/Input/Event.h b/src/libjin/Input/Event.h
index af2ced2..3f2bc8e 100644
--- a/src/libjin/Input/Event.h
+++ b/src/libjin/Input/Event.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_EVENT_H
 #define __LIBJIN_EVENT_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_INPUT   
 
 namespace jin
diff --git a/src/libjin/Input/Mouse.cpp b/src/libjin/Input/Mouse.cpp
index 9fcb4ee..dcaa771 100644
--- a/src/libjin/Input/Mouse.cpp
+++ b/src/libjin/Input/Mouse.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #ifdef LIBJIN_MODULES_INPUT    
 
 #include "SDL.h"
diff --git a/src/libjin/Input/Mouse.h b/src/libjin/Input/Mouse.h
index 5f77f0d..7e93792 100644
--- a/src/libjin/Input/Mouse.h
+++ b/src/libjin/Input/Mouse.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_MOUSE_H
 #define __LIBJIN_MOUSE_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #ifdef LIBJIN_MODULES_INPUT
 
 #include "../Common/Singleton.hpp"
@@ -17,7 +17,7 @@ namespace jin
 			void setVisible(bool visible);
 
 		private: 
-			SINGLETON(Mouse);
+			singleton(Mouse);
 
 			Mouse() {}; 
 			~Mouse() {}; 
diff --git a/src/libjin/Net/Net.h b/src/libjin/Net/Net.h
index 4cf6e93..3324d11 100644
--- a/src/libjin/Net/Net.h
+++ b/src/libjin/Net/Net.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_NET_H
 #define __LIBJIN_NET_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_NET
 
 #include "../Common/Subsystem.hpp"
@@ -16,7 +16,7 @@ namespace jin
 		public:
 
 		protected:
-			SINGLETON(Net);
+			singleton(Net);
 			Net() {};
 			~Net() {};
 			bool initSystem(const SettingBase* setting) override;
diff --git a/src/libjin/Net/Socket.h b/src/libjin/Net/Socket.h
index dfc1e41..04d3ab0 100644
--- a/src/libjin/Net/Socket.h
+++ b/src/libjin/Net/Socket.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_NET_SOCKET_H
 #define __LIBJIN_NET_SOCKET_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_NET
 
 #include "../3rdparty/tekcos/tekcos.h"
diff --git a/src/libjin/Net/net.h b/src/libjin/Net/net.h
index 4cf6e93..3324d11 100644
--- a/src/libjin/Net/net.h
+++ b/src/libjin/Net/net.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_NET_H
 #define __LIBJIN_NET_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_NET
 
 #include "../Common/Subsystem.hpp"
@@ -16,7 +16,7 @@ namespace jin
 		public:
 
 		protected:
-			SINGLETON(Net);
+			singleton(Net);
 			Net() {};
 			~Net() {};
 			bool initSystem(const SettingBase* setting) override;
diff --git a/src/libjin/Thread/Thread.cpp b/src/libjin/Thread/Thread.cpp
index 6eefca1..3f2a50d 100644
--- a/src/libjin/Thread/Thread.cpp
+++ b/src/libjin/Thread/Thread.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_THREAD
 
 #include "Thread.h"
diff --git a/src/libjin/Thread/Thread.h b/src/libjin/Thread/Thread.h
index 7c126e4..ea50444 100644
--- a/src/libjin/Thread/Thread.h
+++ b/src/libjin/Thread/Thread.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_THREAD_H
 #define __LIBJIN_THREAD_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_THREAD
 
 #include <string>
diff --git a/src/libjin/Thread/thread.cpp b/src/libjin/Thread/thread.cpp
index 6eefca1..3f2a50d 100644
--- a/src/libjin/Thread/thread.cpp
+++ b/src/libjin/Thread/thread.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_THREAD
 
 #include "Thread.h"
diff --git a/src/libjin/Thread/thread.h b/src/libjin/Thread/thread.h
index 7c126e4..ea50444 100644
--- a/src/libjin/Thread/thread.h
+++ b/src/libjin/Thread/thread.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_THREAD_H
 #define __LIBJIN_THREAD_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_THREAD
 
 #include <string>
diff --git a/src/libjin/Time/Timer.cpp b/src/libjin/Time/Timer.cpp
index 54fb2a3..6f3bc80 100644
--- a/src/libjin/Time/Timer.cpp
+++ b/src/libjin/Time/Timer.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_TIME
 
 #include "Timer.h"
diff --git a/src/libjin/Time/Timer.h b/src/libjin/Time/Timer.h
index 8f49ec3..ff67590 100644
--- a/src/libjin/Time/Timer.h
+++ b/src/libjin/Time/Timer.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_TIMER_H
 #define __LIBJIN_TIMER_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_TIME
 
 #include "SDL2/SDL.h"
diff --git a/src/libjin/audio/audio.cpp b/src/libjin/audio/audio.cpp
index 6c68b35..928f01a 100644
--- a/src/libjin/audio/audio.cpp
+++ b/src/libjin/audio/audio.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
diff --git a/src/libjin/audio/audio.h b/src/libjin/audio/audio.h
index 5ba0844..fd391aa 100644
--- a/src/libjin/audio/audio.h
+++ b/src/libjin/audio/audio.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_AUDIO_H
 #define __LIBJIN_AUDIO_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
@@ -38,7 +38,7 @@ namespace jin
 				, state(State::PLAY)
 			{};
 			virtual ~Audio() {};
-			SINGLETON(Audio);
+			singleton(Audio);
 
 			float volume;
 			State state;
diff --git a/src/libjin/audio/source.cpp b/src/libjin/audio/source.cpp
index 8da4cde..646e5ef 100644
--- a/src/libjin/audio/source.cpp
+++ b/src/libjin/audio/source.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include <cstring>
diff --git a/src/libjin/audio/source.h b/src/libjin/audio/source.h
index 07a9a4e..6dfc86c 100644
--- a/src/libjin/audio/source.h
+++ b/src/libjin/audio/source.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_AUDIO_SOURCE_H
 #define __LIBJIN_AUDIO_SOURCE_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
diff --git a/src/libjin/jin_configuration.h b/src/libjin/configuration.h
index 55633a1..55633a1 100644
--- a/src/libjin/jin_configuration.h
+++ b/src/libjin/configuration.h
diff --git a/src/libjin/input/event.h b/src/libjin/input/event.h
index af2ced2..3f2bc8e 100644
--- a/src/libjin/input/event.h
+++ b/src/libjin/input/event.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_EVENT_H
 #define __LIBJIN_EVENT_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_INPUT   
 
 namespace jin
diff --git a/src/libjin/input/mouse.cpp b/src/libjin/input/mouse.cpp
index 9fcb4ee..dcaa771 100644
--- a/src/libjin/input/mouse.cpp
+++ b/src/libjin/input/mouse.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #ifdef LIBJIN_MODULES_INPUT    
 
 #include "SDL.h"
diff --git a/src/libjin/input/mouse.h b/src/libjin/input/mouse.h
index 5f77f0d..7e93792 100644
--- a/src/libjin/input/mouse.h
+++ b/src/libjin/input/mouse.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_MOUSE_H
 #define __LIBJIN_MOUSE_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #ifdef LIBJIN_MODULES_INPUT
 
 #include "../Common/Singleton.hpp"
@@ -17,7 +17,7 @@ namespace jin
 			void setVisible(bool visible);
 
 		private: 
-			SINGLETON(Mouse);
+			singleton(Mouse);
 
 			Mouse() {}; 
 			~Mouse() {}; 
diff --git a/src/libjin/jin.h b/src/libjin/jin.h
index 255616c..ed00271 100644
--- a/src/libjin/jin.h
+++ b/src/libjin/jin.h
@@ -1,7 +1,7 @@
 #ifndef __LIBJIN_H
 #define __LIBJIN_H
 
-#include "jin_configuration.h"
+#include "configuration.h"
 
 #include "Utils/utils.h"
 #ifdef LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO
diff --git a/src/libjin/net/net.h b/src/libjin/net/net.h
index 4cf6e93..3324d11 100644
--- a/src/libjin/net/net.h
+++ b/src/libjin/net/net.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_NET_H
 #define __LIBJIN_NET_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_NET
 
 #include "../Common/Subsystem.hpp"
@@ -16,7 +16,7 @@ namespace jin
 		public:
 
 		protected:
-			SINGLETON(Net);
+			singleton(Net);
 			Net() {};
 			~Net() {};
 			bool initSystem(const SettingBase* setting) override;
diff --git a/src/libjin/thread/thread.cpp b/src/libjin/thread/thread.cpp
index 6eefca1..3f2a50d 100644
--- a/src/libjin/thread/thread.cpp
+++ b/src/libjin/thread/thread.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_THREAD
 
 #include "Thread.h"
diff --git a/src/libjin/thread/thread.h b/src/libjin/thread/thread.h
index 7c126e4..ea50444 100644
--- a/src/libjin/thread/thread.h
+++ b/src/libjin/thread/thread.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_THREAD_H
 #define __LIBJIN_THREAD_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
 #if LIBJIN_MODULES_THREAD
 
 #include <string>