Renomeia dx.hpp para xna-dx.hpp

framework/platform-dx/adapter.cpp

@@ -1,7 +1,7 @@
 #include "xna/graphics/adapter.hpp"
 #include "xna/graphics/displaymode.hpp"
 #include "xna/game/gdevicemanager.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	static size_t getDisplayModesCount(IDXGIAdapter* adapter);

framework/platform-dx/audioengine.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	void AudioEngine::Initialize() {

framework/platform-dx/blendstate.cpp

@@ -1,6 +1,6 @@
 #include "xna/graphics/blendstate.hpp"
 #include "xna/graphics/gresource.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	BlendState::BlendState() : BlendState(nullptr) {}

framework/platform-dx/depthstencilstate.cpp

@@ -1,5 +1,5 @@
 #include "xna/graphics/depthstencilstate.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	static D3D11_DEPTH_STENCIL_DESC defaultDesc() {

framework/platform-dx/device.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 #include "xna/game/gdevicemanager.hpp"
 
 namespace xna {

framework/platform-dx/displaymode.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 #include "xna/graphics/displaymode.hpp"
 
 namespace xna {

framework/platform-dx/effect.cpp

@@ -1,5 +1,5 @@
 #include "xna/graphics/effect.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 #include "xna/common/math.hpp"
 
 using DxBasicEffect = DirectX::BasicEffect;

framework/platform-dx/game.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	Game::Game() {

framework/platform-dx/gamepad.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 #include "xna/input/gamepad.hpp"
 
 namespace xna {

framework/platform-dx/gdevicemanager.cpp

@@ -1,7 +1,7 @@
 #include "xna/game/gdevicemanager.hpp"
 #include "xna/graphics/presentparams.hpp"
 #include "xna/graphics/swapchain.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	GraphicsDeviceManager::GraphicsDeviceManager(sptr<Game> const& game) : _game(game)

framework/platform-dx/init.cpp

@@ -3,7 +3,7 @@
 #include "xna/content/readers/audio.hpp"
 #include "xna/content/typereadermanager.hpp"
 #include "xna/content/readers/default.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	void Platform::Init() {		

framework/platform-dx/keyboard.cpp

@@ -1,5 +1,5 @@
 #include "xna/input/keyboard.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	KeyboardState Keyboard::GetState() {

framework/platform-dx/mouse.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	MouseState Mouse::GetState() {

framework/platform-dx/rasterizerstate.cpp

@@ -1,5 +1,5 @@
 #include "xna/graphics/rasterizerstate.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 

framework/platform-dx/rendertarget.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	RenderTarget2D::RenderTarget2D() : Texture2D() {

framework/platform-dx/samplerstate.cpp

@@ -1,6 +1,6 @@
 #include "xna/graphics/samplerstate.hpp"
 #include "xna/graphics/samplerstate.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	SamplerState::SamplerState() : SamplerState(nullptr){}

framework/platform-dx/soundeffect.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 #include "xna/csharp/stream.hpp"
 
 using DxSoundEffect = DirectX::SoundEffect;

framework/platform-dx/sprite.cpp

@@ -6,7 +6,7 @@
 #include "xna/graphics/viewport.hpp"
 #include "xna/graphics/blendstate.hpp"
 #include "xna/graphics/depthstencilstate.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 #include <functional>
 
 using DxSpriteBatch = DirectX::SpriteBatch;

framework/platform-dx/swapchain.cpp

@@ -1,6 +1,6 @@
 #include "xna/graphics/adapter.hpp"
 #include "xna/graphics/swapchain.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 #include "xna/graphics/device.hpp"
 
 namespace xna {

framework/platform-dx/texture.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {	
 	Texture2D::~Texture2D() {

framework/platform-dx/window.cpp

@@ -1,4 +1,4 @@
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 namespace xna {
 	GameWindow::GameWindow() {

inc/xna/xna-dx.hpp

@@ -53,7 +53,7 @@ using comptr = Microsoft::WRL::ComPtr<T>;
 
 //---------------- INCLUDES ----------------//
 
-#include "../xna.hpp"
+#include "xna.hpp"
 
 //---------------- CLASSES ----------------//
 

samples/01_blank/xna.cpp

@@ -2,7 +2,7 @@
 //
 
 #include "xna/xna.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"
 
 using namespace std;
 using namespace xna;

samples/02_PlatfformerStarterKit/headers.hpp

@@ -1,2 +1,2 @@
 #include "xna/xna.hpp"
-#include "xna/platform/dx.hpp"
+#include "xna/xna-dx.hpp"