diff --git a/build/scripts/tools/ndk.lua b/build/scripts/tools/ndk.lua index 1f7000351..49d7ee94d 100644 --- a/build/scripts/tools/ndk.lua +++ b/build/scripts/tools/ndk.lua @@ -9,16 +9,16 @@ TOOL.Defines = { } TOOL.Includes = { - "../SDK/include", - "../SDK/src" + "../include", + "../src" } TOOL.Files = { - "../SDK/include/NazaraSDK/**.hpp", - "../SDK/include/NazaraSDK/**.inl", - "../SDK/src/NazaraSDK/**.hpp", - "../SDK/src/NazaraSDK/**.inl", - "../SDK/src/NazaraSDK/**.cpp" + "../include/NazaraSDK/**.hpp", + "../include/NazaraSDK/**.inl", + "../src/NazaraSDK/**.hpp", + "../src/NazaraSDK/**.inl", + "../src/NazaraSDK/**.cpp" } TOOL.Libraries = function() diff --git a/build/scripts/tools/ndk_server.lua b/build/scripts/tools/ndk_server.lua index 8a74510fd..96ef7a0ab 100644 --- a/build/scripts/tools/ndk_server.lua +++ b/build/scripts/tools/ndk_server.lua @@ -10,36 +10,37 @@ TOOL.Defines = { } TOOL.Includes = { - "../SDK/include", - "../SDK/src" + "../include", + "../src" } TOOL.Files = { - "../SDK/include/NDK/**.hpp", - "../SDK/include/NDK/**.inl", - "../SDK/src/NDK/**.hpp", - "../SDK/src/NDK/**.inl", - "../SDK/src/NDK/**.cpp" + "../include/NazaraSDK/**.hpp", + "../include/NazaraSDK/**.inl", + "../src/NazaraSDK/**.hpp", + "../src/NazaraSDK/**.inl", + "../src/NazaraSDK/**.cpp" } -- Excludes client-only files TOOL.FilesExcluded = { - "../SDK/**/CameraComponent.*", - "../SDK/**/Canvas.*", - "../SDK/**/Console.*", - "../SDK/**/DebugComponent.*", - "../SDK/**/DebugSystem.*", - "../SDK/**/GraphicsComponent.*", - "../SDK/**/LightComponent.*", - "../SDK/**/ListenerComponent.*", - "../SDK/**/ListenerSystem.*", - "../SDK/**/Particle*Component.*", - "../SDK/**/ParticleSystem.*", - "../SDK/**/RenderSystem.*", - "../SDK/**/*Layout*.*" + "../*/NazaraSDK/BaseWidget.*", + "../*/NazaraSDK/Canvas.*", + "../*/NazaraSDK/Console.*", + "../*/NazaraSDK/**/CameraComponent.*", + "../*/NazaraSDK/**/DebugComponent.*", + "../*/NazaraSDK/**/DebugSystem.*", + "../*/NazaraSDK/**/GraphicsComponent.*", + "../*/NazaraSDK/**/LightComponent.*", + "../*/NazaraSDK/**/ListenerComponent.*", + "../*/NazaraSDK/**/ListenerSystem.*", + "../*/NazaraSDK/**/Particle*Component.*", + "../*/NazaraSDK/**/ParticleSystem.*", + "../*/NazaraSDK/**/RenderSystem.*", + "../*/NazaraSDK/**/*Layout*.*", + "../*/NazaraSDK/**/*Widget*.*" } - TOOL.Libraries = { "NazaraCore", "NazaraNetwork", diff --git a/SDK/include/NazaraSDK/Algorithm.hpp b/include/NazaraSDK/Algorithm.hpp similarity index 100% rename from SDK/include/NazaraSDK/Algorithm.hpp rename to include/NazaraSDK/Algorithm.hpp diff --git a/SDK/include/NazaraSDK/Algorithm.inl b/include/NazaraSDK/Algorithm.inl similarity index 100% rename from SDK/include/NazaraSDK/Algorithm.inl rename to include/NazaraSDK/Algorithm.inl diff --git a/SDK/include/NazaraSDK/Application.hpp b/include/NazaraSDK/Application.hpp similarity index 100% rename from SDK/include/NazaraSDK/Application.hpp rename to include/NazaraSDK/Application.hpp diff --git a/SDK/include/NazaraSDK/Application.inl b/include/NazaraSDK/Application.inl similarity index 100% rename from SDK/include/NazaraSDK/Application.inl rename to include/NazaraSDK/Application.inl diff --git a/SDK/include/NazaraSDK/BaseComponent.hpp b/include/NazaraSDK/BaseComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/BaseComponent.hpp rename to include/NazaraSDK/BaseComponent.hpp diff --git a/SDK/include/NazaraSDK/BaseComponent.inl b/include/NazaraSDK/BaseComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/BaseComponent.inl rename to include/NazaraSDK/BaseComponent.inl diff --git a/SDK/include/NazaraSDK/BaseSystem.hpp b/include/NazaraSDK/BaseSystem.hpp similarity index 100% rename from SDK/include/NazaraSDK/BaseSystem.hpp rename to include/NazaraSDK/BaseSystem.hpp diff --git a/SDK/include/NazaraSDK/BaseSystem.inl b/include/NazaraSDK/BaseSystem.inl similarity index 100% rename from SDK/include/NazaraSDK/BaseSystem.inl rename to include/NazaraSDK/BaseSystem.inl diff --git a/SDK/include/NazaraSDK/BaseWidget.hpp b/include/NazaraSDK/BaseWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/BaseWidget.hpp rename to include/NazaraSDK/BaseWidget.hpp diff --git a/SDK/include/NazaraSDK/BaseWidget.inl b/include/NazaraSDK/BaseWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/BaseWidget.inl rename to include/NazaraSDK/BaseWidget.inl diff --git a/SDK/include/NazaraSDK/Canvas.hpp b/include/NazaraSDK/Canvas.hpp similarity index 100% rename from SDK/include/NazaraSDK/Canvas.hpp rename to include/NazaraSDK/Canvas.hpp diff --git a/SDK/include/NazaraSDK/Canvas.inl b/include/NazaraSDK/Canvas.inl similarity index 100% rename from SDK/include/NazaraSDK/Canvas.inl rename to include/NazaraSDK/Canvas.inl diff --git a/SDK/include/NazaraSDK/Component.hpp b/include/NazaraSDK/Component.hpp similarity index 100% rename from SDK/include/NazaraSDK/Component.hpp rename to include/NazaraSDK/Component.hpp diff --git a/SDK/include/NazaraSDK/Component.inl b/include/NazaraSDK/Component.inl similarity index 100% rename from SDK/include/NazaraSDK/Component.inl rename to include/NazaraSDK/Component.inl diff --git a/SDK/include/NazaraSDK/Components.hpp b/include/NazaraSDK/Components.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components.hpp rename to include/NazaraSDK/Components.hpp diff --git a/SDK/include/NazaraSDK/Components/CameraComponent.hpp b/include/NazaraSDK/Components/CameraComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/CameraComponent.hpp rename to include/NazaraSDK/Components/CameraComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/CameraComponent.inl b/include/NazaraSDK/Components/CameraComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/CameraComponent.inl rename to include/NazaraSDK/Components/CameraComponent.inl diff --git a/SDK/include/NazaraSDK/Components/CollisionComponent2D.hpp b/include/NazaraSDK/Components/CollisionComponent2D.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/CollisionComponent2D.hpp rename to include/NazaraSDK/Components/CollisionComponent2D.hpp diff --git a/SDK/include/NazaraSDK/Components/CollisionComponent2D.inl b/include/NazaraSDK/Components/CollisionComponent2D.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/CollisionComponent2D.inl rename to include/NazaraSDK/Components/CollisionComponent2D.inl diff --git a/SDK/include/NazaraSDK/Components/CollisionComponent3D.hpp b/include/NazaraSDK/Components/CollisionComponent3D.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/CollisionComponent3D.hpp rename to include/NazaraSDK/Components/CollisionComponent3D.hpp diff --git a/SDK/include/NazaraSDK/Components/CollisionComponent3D.inl b/include/NazaraSDK/Components/CollisionComponent3D.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/CollisionComponent3D.inl rename to include/NazaraSDK/Components/CollisionComponent3D.inl diff --git a/SDK/include/NazaraSDK/Components/ConstraintComponent2D.hpp b/include/NazaraSDK/Components/ConstraintComponent2D.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/ConstraintComponent2D.hpp rename to include/NazaraSDK/Components/ConstraintComponent2D.hpp diff --git a/SDK/include/NazaraSDK/Components/ConstraintComponent2D.inl b/include/NazaraSDK/Components/ConstraintComponent2D.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/ConstraintComponent2D.inl rename to include/NazaraSDK/Components/ConstraintComponent2D.inl diff --git a/SDK/include/NazaraSDK/Components/DebugComponent.hpp b/include/NazaraSDK/Components/DebugComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/DebugComponent.hpp rename to include/NazaraSDK/Components/DebugComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/DebugComponent.inl b/include/NazaraSDK/Components/DebugComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/DebugComponent.inl rename to include/NazaraSDK/Components/DebugComponent.inl diff --git a/SDK/include/NazaraSDK/Components/GraphicsComponent.hpp b/include/NazaraSDK/Components/GraphicsComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/GraphicsComponent.hpp rename to include/NazaraSDK/Components/GraphicsComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/GraphicsComponent.inl b/include/NazaraSDK/Components/GraphicsComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/GraphicsComponent.inl rename to include/NazaraSDK/Components/GraphicsComponent.inl diff --git a/SDK/include/NazaraSDK/Components/LifetimeComponent.hpp b/include/NazaraSDK/Components/LifetimeComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/LifetimeComponent.hpp rename to include/NazaraSDK/Components/LifetimeComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/LifetimeComponent.inl b/include/NazaraSDK/Components/LifetimeComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/LifetimeComponent.inl rename to include/NazaraSDK/Components/LifetimeComponent.inl diff --git a/SDK/include/NazaraSDK/Components/LightComponent.hpp b/include/NazaraSDK/Components/LightComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/LightComponent.hpp rename to include/NazaraSDK/Components/LightComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/LightComponent.inl b/include/NazaraSDK/Components/LightComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/LightComponent.inl rename to include/NazaraSDK/Components/LightComponent.inl diff --git a/SDK/include/NazaraSDK/Components/ListenerComponent.hpp b/include/NazaraSDK/Components/ListenerComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/ListenerComponent.hpp rename to include/NazaraSDK/Components/ListenerComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/ListenerComponent.inl b/include/NazaraSDK/Components/ListenerComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/ListenerComponent.inl rename to include/NazaraSDK/Components/ListenerComponent.inl diff --git a/SDK/include/NazaraSDK/Components/NodeComponent.hpp b/include/NazaraSDK/Components/NodeComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/NodeComponent.hpp rename to include/NazaraSDK/Components/NodeComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/NodeComponent.inl b/include/NazaraSDK/Components/NodeComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/NodeComponent.inl rename to include/NazaraSDK/Components/NodeComponent.inl diff --git a/SDK/include/NazaraSDK/Components/ParticleEmitterComponent.hpp b/include/NazaraSDK/Components/ParticleEmitterComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/ParticleEmitterComponent.hpp rename to include/NazaraSDK/Components/ParticleEmitterComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/ParticleEmitterComponent.inl b/include/NazaraSDK/Components/ParticleEmitterComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/ParticleEmitterComponent.inl rename to include/NazaraSDK/Components/ParticleEmitterComponent.inl diff --git a/SDK/include/NazaraSDK/Components/ParticleGroupComponent.hpp b/include/NazaraSDK/Components/ParticleGroupComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/ParticleGroupComponent.hpp rename to include/NazaraSDK/Components/ParticleGroupComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/ParticleGroupComponent.inl b/include/NazaraSDK/Components/ParticleGroupComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/ParticleGroupComponent.inl rename to include/NazaraSDK/Components/ParticleGroupComponent.inl diff --git a/SDK/include/NazaraSDK/Components/PhysicsComponent2D.hpp b/include/NazaraSDK/Components/PhysicsComponent2D.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/PhysicsComponent2D.hpp rename to include/NazaraSDK/Components/PhysicsComponent2D.hpp diff --git a/SDK/include/NazaraSDK/Components/PhysicsComponent2D.inl b/include/NazaraSDK/Components/PhysicsComponent2D.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/PhysicsComponent2D.inl rename to include/NazaraSDK/Components/PhysicsComponent2D.inl diff --git a/SDK/include/NazaraSDK/Components/PhysicsComponent3D.hpp b/include/NazaraSDK/Components/PhysicsComponent3D.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/PhysicsComponent3D.hpp rename to include/NazaraSDK/Components/PhysicsComponent3D.hpp diff --git a/SDK/include/NazaraSDK/Components/PhysicsComponent3D.inl b/include/NazaraSDK/Components/PhysicsComponent3D.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/PhysicsComponent3D.inl rename to include/NazaraSDK/Components/PhysicsComponent3D.inl diff --git a/SDK/include/NazaraSDK/Components/VelocityComponent.hpp b/include/NazaraSDK/Components/VelocityComponent.hpp similarity index 100% rename from SDK/include/NazaraSDK/Components/VelocityComponent.hpp rename to include/NazaraSDK/Components/VelocityComponent.hpp diff --git a/SDK/include/NazaraSDK/Components/VelocityComponent.inl b/include/NazaraSDK/Components/VelocityComponent.inl similarity index 100% rename from SDK/include/NazaraSDK/Components/VelocityComponent.inl rename to include/NazaraSDK/Components/VelocityComponent.inl diff --git a/SDK/include/NazaraSDK/Console.hpp b/include/NazaraSDK/Console.hpp similarity index 100% rename from SDK/include/NazaraSDK/Console.hpp rename to include/NazaraSDK/Console.hpp diff --git a/SDK/include/NazaraSDK/Console.inl b/include/NazaraSDK/Console.inl similarity index 100% rename from SDK/include/NazaraSDK/Console.inl rename to include/NazaraSDK/Console.inl diff --git a/SDK/include/NazaraSDK/Entity.hpp b/include/NazaraSDK/Entity.hpp similarity index 100% rename from SDK/include/NazaraSDK/Entity.hpp rename to include/NazaraSDK/Entity.hpp diff --git a/SDK/include/NazaraSDK/Entity.inl b/include/NazaraSDK/Entity.inl similarity index 100% rename from SDK/include/NazaraSDK/Entity.inl rename to include/NazaraSDK/Entity.inl diff --git a/SDK/include/NazaraSDK/EntityList.hpp b/include/NazaraSDK/EntityList.hpp similarity index 100% rename from SDK/include/NazaraSDK/EntityList.hpp rename to include/NazaraSDK/EntityList.hpp diff --git a/SDK/include/NazaraSDK/EntityList.inl b/include/NazaraSDK/EntityList.inl similarity index 100% rename from SDK/include/NazaraSDK/EntityList.inl rename to include/NazaraSDK/EntityList.inl diff --git a/SDK/include/NazaraSDK/EntityOwner.hpp b/include/NazaraSDK/EntityOwner.hpp similarity index 100% rename from SDK/include/NazaraSDK/EntityOwner.hpp rename to include/NazaraSDK/EntityOwner.hpp diff --git a/SDK/include/NazaraSDK/EntityOwner.inl b/include/NazaraSDK/EntityOwner.inl similarity index 100% rename from SDK/include/NazaraSDK/EntityOwner.inl rename to include/NazaraSDK/EntityOwner.inl diff --git a/SDK/include/NazaraSDK/Prerequisites.hpp b/include/NazaraSDK/Prerequisites.hpp similarity index 100% rename from SDK/include/NazaraSDK/Prerequisites.hpp rename to include/NazaraSDK/Prerequisites.hpp diff --git a/SDK/include/NazaraSDK/Sdk.hpp b/include/NazaraSDK/Sdk.hpp similarity index 100% rename from SDK/include/NazaraSDK/Sdk.hpp rename to include/NazaraSDK/Sdk.hpp diff --git a/SDK/include/NazaraSDK/Sdk.inl b/include/NazaraSDK/Sdk.inl similarity index 100% rename from SDK/include/NazaraSDK/Sdk.inl rename to include/NazaraSDK/Sdk.inl diff --git a/SDK/include/NazaraSDK/State.hpp b/include/NazaraSDK/State.hpp similarity index 100% rename from SDK/include/NazaraSDK/State.hpp rename to include/NazaraSDK/State.hpp diff --git a/SDK/include/NazaraSDK/StateMachine.hpp b/include/NazaraSDK/StateMachine.hpp similarity index 100% rename from SDK/include/NazaraSDK/StateMachine.hpp rename to include/NazaraSDK/StateMachine.hpp diff --git a/SDK/include/NazaraSDK/StateMachine.inl b/include/NazaraSDK/StateMachine.inl similarity index 100% rename from SDK/include/NazaraSDK/StateMachine.inl rename to include/NazaraSDK/StateMachine.inl diff --git a/SDK/include/NazaraSDK/System.hpp b/include/NazaraSDK/System.hpp similarity index 100% rename from SDK/include/NazaraSDK/System.hpp rename to include/NazaraSDK/System.hpp diff --git a/SDK/include/NazaraSDK/System.inl b/include/NazaraSDK/System.inl similarity index 100% rename from SDK/include/NazaraSDK/System.inl rename to include/NazaraSDK/System.inl diff --git a/SDK/include/NazaraSDK/Systems.hpp b/include/NazaraSDK/Systems.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems.hpp rename to include/NazaraSDK/Systems.hpp diff --git a/SDK/include/NazaraSDK/Systems/DebugSystem.hpp b/include/NazaraSDK/Systems/DebugSystem.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/DebugSystem.hpp rename to include/NazaraSDK/Systems/DebugSystem.hpp diff --git a/SDK/include/NazaraSDK/Systems/DebugSystem.inl b/include/NazaraSDK/Systems/DebugSystem.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/DebugSystem.inl rename to include/NazaraSDK/Systems/DebugSystem.inl diff --git a/SDK/include/NazaraSDK/Systems/LifetimeSystem.hpp b/include/NazaraSDK/Systems/LifetimeSystem.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/LifetimeSystem.hpp rename to include/NazaraSDK/Systems/LifetimeSystem.hpp diff --git a/SDK/include/NazaraSDK/Systems/LifetimeSystem.inl b/include/NazaraSDK/Systems/LifetimeSystem.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/LifetimeSystem.inl rename to include/NazaraSDK/Systems/LifetimeSystem.inl diff --git a/SDK/include/NazaraSDK/Systems/ListenerSystem.hpp b/include/NazaraSDK/Systems/ListenerSystem.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/ListenerSystem.hpp rename to include/NazaraSDK/Systems/ListenerSystem.hpp diff --git a/SDK/include/NazaraSDK/Systems/ListenerSystem.inl b/include/NazaraSDK/Systems/ListenerSystem.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/ListenerSystem.inl rename to include/NazaraSDK/Systems/ListenerSystem.inl diff --git a/SDK/include/NazaraSDK/Systems/ParticleSystem.hpp b/include/NazaraSDK/Systems/ParticleSystem.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/ParticleSystem.hpp rename to include/NazaraSDK/Systems/ParticleSystem.hpp diff --git a/SDK/include/NazaraSDK/Systems/ParticleSystem.inl b/include/NazaraSDK/Systems/ParticleSystem.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/ParticleSystem.inl rename to include/NazaraSDK/Systems/ParticleSystem.inl diff --git a/SDK/include/NazaraSDK/Systems/PhysicsSystem2D.hpp b/include/NazaraSDK/Systems/PhysicsSystem2D.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/PhysicsSystem2D.hpp rename to include/NazaraSDK/Systems/PhysicsSystem2D.hpp diff --git a/SDK/include/NazaraSDK/Systems/PhysicsSystem2D.inl b/include/NazaraSDK/Systems/PhysicsSystem2D.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/PhysicsSystem2D.inl rename to include/NazaraSDK/Systems/PhysicsSystem2D.inl diff --git a/SDK/include/NazaraSDK/Systems/PhysicsSystem3D.hpp b/include/NazaraSDK/Systems/PhysicsSystem3D.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/PhysicsSystem3D.hpp rename to include/NazaraSDK/Systems/PhysicsSystem3D.hpp diff --git a/SDK/include/NazaraSDK/Systems/PhysicsSystem3D.inl b/include/NazaraSDK/Systems/PhysicsSystem3D.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/PhysicsSystem3D.inl rename to include/NazaraSDK/Systems/PhysicsSystem3D.inl diff --git a/SDK/include/NazaraSDK/Systems/RenderSystem.hpp b/include/NazaraSDK/Systems/RenderSystem.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/RenderSystem.hpp rename to include/NazaraSDK/Systems/RenderSystem.hpp diff --git a/SDK/include/NazaraSDK/Systems/RenderSystem.inl b/include/NazaraSDK/Systems/RenderSystem.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/RenderSystem.inl rename to include/NazaraSDK/Systems/RenderSystem.inl diff --git a/SDK/include/NazaraSDK/Systems/VelocitySystem.hpp b/include/NazaraSDK/Systems/VelocitySystem.hpp similarity index 100% rename from SDK/include/NazaraSDK/Systems/VelocitySystem.hpp rename to include/NazaraSDK/Systems/VelocitySystem.hpp diff --git a/SDK/include/NazaraSDK/Systems/VelocitySystem.inl b/include/NazaraSDK/Systems/VelocitySystem.inl similarity index 100% rename from SDK/include/NazaraSDK/Systems/VelocitySystem.inl rename to include/NazaraSDK/Systems/VelocitySystem.inl diff --git a/SDK/include/NazaraSDK/Widgets.hpp b/include/NazaraSDK/Widgets.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets.hpp rename to include/NazaraSDK/Widgets.hpp diff --git a/SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.hpp b/include/NazaraSDK/Widgets/AbstractTextAreaWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.hpp rename to include/NazaraSDK/Widgets/AbstractTextAreaWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.inl b/include/NazaraSDK/Widgets/AbstractTextAreaWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/AbstractTextAreaWidget.inl rename to include/NazaraSDK/Widgets/AbstractTextAreaWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/BoxLayout.hpp b/include/NazaraSDK/Widgets/BoxLayout.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/BoxLayout.hpp rename to include/NazaraSDK/Widgets/BoxLayout.hpp diff --git a/SDK/include/NazaraSDK/Widgets/BoxLayout.inl b/include/NazaraSDK/Widgets/BoxLayout.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/BoxLayout.inl rename to include/NazaraSDK/Widgets/BoxLayout.inl diff --git a/SDK/include/NazaraSDK/Widgets/ButtonWidget.hpp b/include/NazaraSDK/Widgets/ButtonWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ButtonWidget.hpp rename to include/NazaraSDK/Widgets/ButtonWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/ButtonWidget.inl b/include/NazaraSDK/Widgets/ButtonWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ButtonWidget.inl rename to include/NazaraSDK/Widgets/ButtonWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/CheckboxWidget.hpp b/include/NazaraSDK/Widgets/CheckboxWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/CheckboxWidget.hpp rename to include/NazaraSDK/Widgets/CheckboxWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/CheckboxWidget.inl b/include/NazaraSDK/Widgets/CheckboxWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/CheckboxWidget.inl rename to include/NazaraSDK/Widgets/CheckboxWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/Enums.hpp b/include/NazaraSDK/Widgets/Enums.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/Enums.hpp rename to include/NazaraSDK/Widgets/Enums.hpp diff --git a/SDK/include/NazaraSDK/Widgets/ImageWidget.hpp b/include/NazaraSDK/Widgets/ImageWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ImageWidget.hpp rename to include/NazaraSDK/Widgets/ImageWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/ImageWidget.inl b/include/NazaraSDK/Widgets/ImageWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ImageWidget.inl rename to include/NazaraSDK/Widgets/ImageWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/LabelWidget.hpp b/include/NazaraSDK/Widgets/LabelWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/LabelWidget.hpp rename to include/NazaraSDK/Widgets/LabelWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/LabelWidget.inl b/include/NazaraSDK/Widgets/LabelWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/LabelWidget.inl rename to include/NazaraSDK/Widgets/LabelWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/ProgressBarWidget.hpp b/include/NazaraSDK/Widgets/ProgressBarWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ProgressBarWidget.hpp rename to include/NazaraSDK/Widgets/ProgressBarWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/ProgressBarWidget.inl b/include/NazaraSDK/Widgets/ProgressBarWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ProgressBarWidget.inl rename to include/NazaraSDK/Widgets/ProgressBarWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.hpp b/include/NazaraSDK/Widgets/RichTextAreaWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.hpp rename to include/NazaraSDK/Widgets/RichTextAreaWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.inl b/include/NazaraSDK/Widgets/RichTextAreaWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/RichTextAreaWidget.inl rename to include/NazaraSDK/Widgets/RichTextAreaWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.hpp b/include/NazaraSDK/Widgets/ScrollAreaWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.hpp rename to include/NazaraSDK/Widgets/ScrollAreaWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.inl b/include/NazaraSDK/Widgets/ScrollAreaWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/ScrollAreaWidget.inl rename to include/NazaraSDK/Widgets/ScrollAreaWidget.inl diff --git a/SDK/include/NazaraSDK/Widgets/TextAreaWidget.hpp b/include/NazaraSDK/Widgets/TextAreaWidget.hpp similarity index 100% rename from SDK/include/NazaraSDK/Widgets/TextAreaWidget.hpp rename to include/NazaraSDK/Widgets/TextAreaWidget.hpp diff --git a/SDK/include/NazaraSDK/Widgets/TextAreaWidget.inl b/include/NazaraSDK/Widgets/TextAreaWidget.inl similarity index 100% rename from SDK/include/NazaraSDK/Widgets/TextAreaWidget.inl rename to include/NazaraSDK/Widgets/TextAreaWidget.inl diff --git a/SDK/include/NazaraSDK/World.hpp b/include/NazaraSDK/World.hpp similarity index 100% rename from SDK/include/NazaraSDK/World.hpp rename to include/NazaraSDK/World.hpp diff --git a/SDK/include/NazaraSDK/World.inl b/include/NazaraSDK/World.inl similarity index 100% rename from SDK/include/NazaraSDK/World.inl rename to include/NazaraSDK/World.inl diff --git a/SDK/src/NazaraSDK/Application.cpp b/src/NazaraSDK/Application.cpp similarity index 96% rename from SDK/src/NazaraSDK/Application.cpp rename to src/NazaraSDK/Application.cpp index b9a7047b4..d96fa23d8 100644 --- a/SDK/src/NazaraSDK/Application.cpp +++ b/src/NazaraSDK/Application.cpp @@ -2,17 +2,17 @@ // This file is part of the "Nazara Development Kit" // For conditions of distribution and use, see copyright notice in Prerequisites.hpp -#include +#include #include #include #ifndef NDK_SERVER -#include -#include -#include -#include #include #include +#include +#include +#include +#include #endif namespace Ndk diff --git a/SDK/src/NazaraSDK/BaseComponent.cpp b/src/NazaraSDK/BaseComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/BaseComponent.cpp rename to src/NazaraSDK/BaseComponent.cpp diff --git a/SDK/src/NazaraSDK/BaseSystem.cpp b/src/NazaraSDK/BaseSystem.cpp similarity index 100% rename from SDK/src/NazaraSDK/BaseSystem.cpp rename to src/NazaraSDK/BaseSystem.cpp diff --git a/SDK/src/NazaraSDK/BaseWidget.cpp b/src/NazaraSDK/BaseWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/BaseWidget.cpp rename to src/NazaraSDK/BaseWidget.cpp diff --git a/SDK/src/NazaraSDK/Canvas.cpp b/src/NazaraSDK/Canvas.cpp similarity index 100% rename from SDK/src/NazaraSDK/Canvas.cpp rename to src/NazaraSDK/Canvas.cpp diff --git a/SDK/src/NazaraSDK/Components/CameraComponent.cpp b/src/NazaraSDK/Components/CameraComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/CameraComponent.cpp rename to src/NazaraSDK/Components/CameraComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/CollisionComponent2D.cpp b/src/NazaraSDK/Components/CollisionComponent2D.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/CollisionComponent2D.cpp rename to src/NazaraSDK/Components/CollisionComponent2D.cpp diff --git a/SDK/src/NazaraSDK/Components/CollisionComponent3D.cpp b/src/NazaraSDK/Components/CollisionComponent3D.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/CollisionComponent3D.cpp rename to src/NazaraSDK/Components/CollisionComponent3D.cpp diff --git a/SDK/src/NazaraSDK/Components/ConstraintComponent2D.cpp b/src/NazaraSDK/Components/ConstraintComponent2D.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/ConstraintComponent2D.cpp rename to src/NazaraSDK/Components/ConstraintComponent2D.cpp diff --git a/SDK/src/NazaraSDK/Components/DebugComponent.cpp b/src/NazaraSDK/Components/DebugComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/DebugComponent.cpp rename to src/NazaraSDK/Components/DebugComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/GraphicsComponent.cpp b/src/NazaraSDK/Components/GraphicsComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/GraphicsComponent.cpp rename to src/NazaraSDK/Components/GraphicsComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/LifetimeComponent.cpp b/src/NazaraSDK/Components/LifetimeComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/LifetimeComponent.cpp rename to src/NazaraSDK/Components/LifetimeComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/LightComponent.cpp b/src/NazaraSDK/Components/LightComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/LightComponent.cpp rename to src/NazaraSDK/Components/LightComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/ListenerComponent.cpp b/src/NazaraSDK/Components/ListenerComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/ListenerComponent.cpp rename to src/NazaraSDK/Components/ListenerComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/NodeComponent.cpp b/src/NazaraSDK/Components/NodeComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/NodeComponent.cpp rename to src/NazaraSDK/Components/NodeComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/ParticleEmitterComponent.cpp b/src/NazaraSDK/Components/ParticleEmitterComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/ParticleEmitterComponent.cpp rename to src/NazaraSDK/Components/ParticleEmitterComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/ParticleGroupComponent.cpp b/src/NazaraSDK/Components/ParticleGroupComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/ParticleGroupComponent.cpp rename to src/NazaraSDK/Components/ParticleGroupComponent.cpp diff --git a/SDK/src/NazaraSDK/Components/PhysicsComponent2D.cpp b/src/NazaraSDK/Components/PhysicsComponent2D.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/PhysicsComponent2D.cpp rename to src/NazaraSDK/Components/PhysicsComponent2D.cpp diff --git a/SDK/src/NazaraSDK/Components/PhysicsComponent3D.cpp b/src/NazaraSDK/Components/PhysicsComponent3D.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/PhysicsComponent3D.cpp rename to src/NazaraSDK/Components/PhysicsComponent3D.cpp diff --git a/SDK/src/NazaraSDK/Components/VelocityComponent.cpp b/src/NazaraSDK/Components/VelocityComponent.cpp similarity index 100% rename from SDK/src/NazaraSDK/Components/VelocityComponent.cpp rename to src/NazaraSDK/Components/VelocityComponent.cpp diff --git a/SDK/src/NazaraSDK/Console.cpp b/src/NazaraSDK/Console.cpp similarity index 100% rename from SDK/src/NazaraSDK/Console.cpp rename to src/NazaraSDK/Console.cpp diff --git a/SDK/src/NazaraSDK/Entity.cpp b/src/NazaraSDK/Entity.cpp similarity index 100% rename from SDK/src/NazaraSDK/Entity.cpp rename to src/NazaraSDK/Entity.cpp diff --git a/SDK/src/NazaraSDK/EntityList.cpp b/src/NazaraSDK/EntityList.cpp similarity index 100% rename from SDK/src/NazaraSDK/EntityList.cpp rename to src/NazaraSDK/EntityList.cpp diff --git a/SDK/src/NazaraSDK/Resources/checkmark.png.h b/src/NazaraSDK/Resources/checkmark.png.h similarity index 100% rename from SDK/src/NazaraSDK/Resources/checkmark.png.h rename to src/NazaraSDK/Resources/checkmark.png.h diff --git a/SDK/src/NazaraSDK/Sdk.cpp b/src/NazaraSDK/Sdk.cpp similarity index 100% rename from SDK/src/NazaraSDK/Sdk.cpp rename to src/NazaraSDK/Sdk.cpp diff --git a/SDK/src/NazaraSDK/State.cpp b/src/NazaraSDK/State.cpp similarity index 100% rename from SDK/src/NazaraSDK/State.cpp rename to src/NazaraSDK/State.cpp diff --git a/SDK/src/NazaraSDK/Systems/DebugSystem.cpp b/src/NazaraSDK/Systems/DebugSystem.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/DebugSystem.cpp rename to src/NazaraSDK/Systems/DebugSystem.cpp diff --git a/SDK/src/NazaraSDK/Systems/LifetimeSystem.cpp b/src/NazaraSDK/Systems/LifetimeSystem.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/LifetimeSystem.cpp rename to src/NazaraSDK/Systems/LifetimeSystem.cpp diff --git a/SDK/src/NazaraSDK/Systems/ListenerSystem.cpp b/src/NazaraSDK/Systems/ListenerSystem.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/ListenerSystem.cpp rename to src/NazaraSDK/Systems/ListenerSystem.cpp diff --git a/SDK/src/NazaraSDK/Systems/ParticleSystem.cpp b/src/NazaraSDK/Systems/ParticleSystem.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/ParticleSystem.cpp rename to src/NazaraSDK/Systems/ParticleSystem.cpp diff --git a/SDK/src/NazaraSDK/Systems/PhysicsSystem2D.cpp b/src/NazaraSDK/Systems/PhysicsSystem2D.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/PhysicsSystem2D.cpp rename to src/NazaraSDK/Systems/PhysicsSystem2D.cpp diff --git a/SDK/src/NazaraSDK/Systems/PhysicsSystem3D.cpp b/src/NazaraSDK/Systems/PhysicsSystem3D.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/PhysicsSystem3D.cpp rename to src/NazaraSDK/Systems/PhysicsSystem3D.cpp diff --git a/SDK/src/NazaraSDK/Systems/RenderSystem.cpp b/src/NazaraSDK/Systems/RenderSystem.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/RenderSystem.cpp rename to src/NazaraSDK/Systems/RenderSystem.cpp diff --git a/SDK/src/NazaraSDK/Systems/VelocitySystem.cpp b/src/NazaraSDK/Systems/VelocitySystem.cpp similarity index 100% rename from SDK/src/NazaraSDK/Systems/VelocitySystem.cpp rename to src/NazaraSDK/Systems/VelocitySystem.cpp diff --git a/SDK/src/NazaraSDK/Widgets/AbstractTextAreaWidget.cpp b/src/NazaraSDK/Widgets/AbstractTextAreaWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/AbstractTextAreaWidget.cpp rename to src/NazaraSDK/Widgets/AbstractTextAreaWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/BoxLayout.cpp b/src/NazaraSDK/Widgets/BoxLayout.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/BoxLayout.cpp rename to src/NazaraSDK/Widgets/BoxLayout.cpp diff --git a/SDK/src/NazaraSDK/Widgets/ButtonWidget.cpp b/src/NazaraSDK/Widgets/ButtonWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/ButtonWidget.cpp rename to src/NazaraSDK/Widgets/ButtonWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/CheckboxWidget.cpp b/src/NazaraSDK/Widgets/CheckboxWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/CheckboxWidget.cpp rename to src/NazaraSDK/Widgets/CheckboxWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/ImageWidget.cpp b/src/NazaraSDK/Widgets/ImageWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/ImageWidget.cpp rename to src/NazaraSDK/Widgets/ImageWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/LabelWidget.cpp b/src/NazaraSDK/Widgets/LabelWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/LabelWidget.cpp rename to src/NazaraSDK/Widgets/LabelWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/ProgressBarWidget.cpp b/src/NazaraSDK/Widgets/ProgressBarWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/ProgressBarWidget.cpp rename to src/NazaraSDK/Widgets/ProgressBarWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/RichTextAreaWidget.cpp b/src/NazaraSDK/Widgets/RichTextAreaWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/RichTextAreaWidget.cpp rename to src/NazaraSDK/Widgets/RichTextAreaWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/ScrollAreaWidget.cpp b/src/NazaraSDK/Widgets/ScrollAreaWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/ScrollAreaWidget.cpp rename to src/NazaraSDK/Widgets/ScrollAreaWidget.cpp diff --git a/SDK/src/NazaraSDK/Widgets/TextAreaWidget.cpp b/src/NazaraSDK/Widgets/TextAreaWidget.cpp similarity index 100% rename from SDK/src/NazaraSDK/Widgets/TextAreaWidget.cpp rename to src/NazaraSDK/Widgets/TextAreaWidget.cpp diff --git a/SDK/src/NazaraSDK/World.cpp b/src/NazaraSDK/World.cpp similarity index 100% rename from SDK/src/NazaraSDK/World.cpp rename to src/NazaraSDK/World.cpp