Last modules fixes

include/NazaraSDK/Sdk.hpp

@@ -7,22 +7,41 @@
 #ifndef NDK_SDK_HPP
 #define NDK_SDK_HPP
 
+#include <Nazara/Core/ModuleBase.hpp>
+#include <Nazara/Core/TypeList.hpp>
 #include <NazaraSDK/Prerequisites.hpp>
 
+#include <Nazara/Network/Network.hpp>
+#include <Nazara/Physics2D/Physics2D.hpp>
+#include <Nazara/Physics3D/Physics3D.hpp>
+#include <Nazara/Shader/Shader.hpp>
+#include <Nazara/Utility/Utility.hpp>
+
+#ifndef NDK_SERVER
+#include <Nazara/Audio/Audio.hpp>
+#include <Nazara/Renderer/Renderer.hpp>
+#endif
+
 namespace Ndk
 {
-	class NDK_API Sdk
+	class NDK_API Sdk : public Nz::ModuleBase<Sdk>
 	{
-		public:
-			Sdk() = delete;
-			~Sdk() = delete;
+		friend ModuleBase;
 
-			static bool Initialize();
-			static bool IsInitialized();
-			static void Uninitialize();
+		public:
+			using CommonDependencies = Nz::TypeList<Nz::Network, Nz::Physics2D, Nz::Physics3D, Nz::Utility>;
+#ifdef NDK_SERVER
+			using Dependencies = CommonDependencies;
+#else
+			using ClientDependencies = Nz::TypeList<Nz::Audio, Nz::Renderer>;
+			using Dependencies = Nz::TypeListConcat<CommonDependencies, ClientDependencies>;
+#endif
+
+			Sdk();
+			~Sdk();
 
 		private:
-			static unsigned int s_referenceCounter;
+			static Sdk* s_instance;
 	};
 }