diff --git a/framework/content/lzx/decoder.cpp b/framework/content/lzx/decoder.cpp index 81ad46a..650e57c 100644 --- a/framework/content/lzx/decoder.cpp +++ b/framework/content/lzx/decoder.cpp @@ -1,6 +1,6 @@ #include "xna/content/lzx/decoder.hpp" -#include "libmspack/mspack.h" -#include "libmspack/lzx.h" +//#include "libmspack/mspack.h" +//#include "libmspack/lzx.h" namespace xna { LzxDecoder::LzxDecoder(int window) { @@ -11,35 +11,35 @@ namespace xna { } int LzxDecoder::Decompress(Stream* inData, int inLen, Stream* outData, int outLen) { - mspack_file* input = nullptr; + /*mspack_file* input = nullptr; mspack_file* output = nullptr; auto lzxstream = lzxd_init( - //struct mspack_system* system, + struct mspack_system* system, nullptr, - //struct mspack_file* input, + struct mspack_file* input, input + inData->Position(), - //struct mspack_file* output, + struct mspack_file* output, output + outData->Position(), - //int window_bits, + int window_bits, window_bits, - //int reset_interval, + int reset_interval, 0, - //int input_buffer_size, + int input_buffer_size, inLen, - //off_t output_length, + off_t output_length, outLen, - //char is_delta + char is_delta 0 ); auto result = lzxd_decompress( - //struct lzxd_stream* lzx, + struct lzxd_stream* lzx, lzxstream, - //off_t out_bytes + off_t out_bytes 0 - ); + );*/ - return result; + return 0; } } \ No newline at end of file diff --git a/framework/platform-dx/adapter.cpp b/framework/platform-dx/adapter.cpp index e522a20..b3d53d5 100644 --- a/framework/platform-dx/adapter.cpp +++ b/framework/platform-dx/adapter.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { static void setOutputVars(comptr const& adapter, String& deviceName, intptr_t& monitorHandle); diff --git a/framework/platform-dx/audioengine.cpp b/framework/platform-dx/audioengine.cpp index 56f8226..4e4fbe9 100644 --- a/framework/platform-dx/audioengine.cpp +++ b/framework/platform-dx/audioengine.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { void AudioEngine::Initialize() { diff --git a/framework/platform-dx/blendstate.cpp b/framework/platform-dx/blendstate.cpp index 6ee8ebe..30e38cb 100644 --- a/framework/platform-dx/blendstate.cpp +++ b/framework/platform-dx/blendstate.cpp @@ -1,6 +1,6 @@ #include "xna/graphics/blendstate.hpp" #include "xna/graphics/gresource.hpp" -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { BlendState::BlendState() : BlendState(nullptr) {} diff --git a/framework/platform-dx/depthstencilstate.cpp b/framework/platform-dx/depthstencilstate.cpp index dcbf545..8b86328 100644 --- a/framework/platform-dx/depthstencilstate.cpp +++ b/framework/platform-dx/depthstencilstate.cpp @@ -1,5 +1,5 @@ #include "xna/graphics/depthstencilstate.hpp" -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { static D3D11_DEPTH_STENCIL_DESC defaultDesc() { diff --git a/framework/platform-dx/device.cpp b/framework/platform-dx/device.cpp index 018dca0..bb1cbd0 100644 --- a/framework/platform-dx/device.cpp +++ b/framework/platform-dx/device.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { static void reset(GraphicsDevice::PlatformImplementation& impl); diff --git a/framework/platform-dx/displaymode.cpp b/framework/platform-dx/displaymode.cpp index 80a56c4..d9f851d 100644 --- a/framework/platform-dx/displaymode.cpp +++ b/framework/platform-dx/displaymode.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" #include "xna/graphics/displaymode.hpp" namespace xna { diff --git a/framework/platform-dx/effect.cpp b/framework/platform-dx/effect.cpp index e67ed90..742e53e 100644 --- a/framework/platform-dx/effect.cpp +++ b/framework/platform-dx/effect.cpp @@ -1,5 +1,5 @@ #include "xna/graphics/effect.hpp" -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" #include "xna/common/math.hpp" using DxBasicEffect = DirectX::BasicEffect; diff --git a/framework/platform-dx/game.cpp b/framework/platform-dx/game.cpp index a52595a..80295bf 100644 --- a/framework/platform-dx/game.cpp +++ b/framework/platform-dx/game.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { Game::Game() { diff --git a/framework/platform-dx/gamepad.cpp b/framework/platform-dx/gamepad.cpp index ec22f4e..d1f7d3f 100644 --- a/framework/platform-dx/gamepad.cpp +++ b/framework/platform-dx/gamepad.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" #include "xna/input/gamepad.hpp" namespace xna { diff --git a/framework/platform-dx/gdevicemanager.cpp b/framework/platform-dx/gdevicemanager.cpp index bfdacdf..bd24b07 100644 --- a/framework/platform-dx/gdevicemanager.cpp +++ b/framework/platform-dx/gdevicemanager.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { static bool IsWindowOnAdapter(intptr_t windowHandle, GraphicsAdapter const& adapter); diff --git a/framework/platform-dx/init.cpp b/framework/platform-dx/init.cpp index 7f69ee8..bf058b2 100644 --- a/framework/platform-dx/init.cpp +++ b/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/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { void Platform::Init() { diff --git a/framework/platform-dx/keyboard.cpp b/framework/platform-dx/keyboard.cpp index 9cf2892..febe06d 100644 --- a/framework/platform-dx/keyboard.cpp +++ b/framework/platform-dx/keyboard.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { KeyboardState Keyboard::GetState() { diff --git a/framework/platform-dx/mouse.cpp b/framework/platform-dx/mouse.cpp index d3f4171..8a2f454 100644 --- a/framework/platform-dx/mouse.cpp +++ b/framework/platform-dx/mouse.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { MouseState Mouse::GetState() { diff --git a/framework/platform-dx/rasterizerstate.cpp b/framework/platform-dx/rasterizerstate.cpp index 777963f..0823ad7 100644 --- a/framework/platform-dx/rasterizerstate.cpp +++ b/framework/platform-dx/rasterizerstate.cpp @@ -1,5 +1,5 @@ #include "xna/graphics/rasterizerstate.hpp" -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { diff --git a/framework/platform-dx/rendertarget.cpp b/framework/platform-dx/rendertarget.cpp index 08a83ca..2f50f40 100644 --- a/framework/platform-dx/rendertarget.cpp +++ b/framework/platform-dx/rendertarget.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { RenderTarget2D::RenderTarget2D() : Texture2D(nullptr) { diff --git a/framework/platform-dx/samplerstate.cpp b/framework/platform-dx/samplerstate.cpp index 5209173..6f5ed96 100644 --- a/framework/platform-dx/samplerstate.cpp +++ b/framework/platform-dx/samplerstate.cpp @@ -1,6 +1,6 @@ #include "xna/graphics/samplerstate.hpp" #include "xna/graphics/samplerstate.hpp" -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { SamplerState::SamplerState() : SamplerState(nullptr){} diff --git a/framework/platform-dx/screen.cpp b/framework/platform-dx/screen.cpp index 1af1482..0c03019 100644 --- a/framework/platform-dx/screen.cpp +++ b/framework/platform-dx/screen.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { diff --git a/framework/platform-dx/soundeffect.cpp b/framework/platform-dx/soundeffect.cpp index 82c19e6..5da1386 100644 --- a/framework/platform-dx/soundeffect.cpp +++ b/framework/platform-dx/soundeffect.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" #include "xna/csharp/stream.hpp" using DxSoundEffect = DirectX::SoundEffect; diff --git a/framework/platform-dx/sprite.cpp b/framework/platform-dx/sprite.cpp index 866eb37..6bc352d 100644 --- a/framework/platform-dx/sprite.cpp +++ b/framework/platform-dx/sprite.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" #include using DxSpriteBatch = DirectX::SpriteBatch; diff --git a/framework/platform-dx/swapchain.cpp b/framework/platform-dx/swapchain.cpp index 04e6ebe..8da6314 100644 --- a/framework/platform-dx/swapchain.cpp +++ b/framework/platform-dx/swapchain.cpp @@ -1,6 +1,6 @@ #include "xna/graphics/adapter.hpp" #include "xna/graphics/swapchain.hpp" -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" #include "xna/graphics/device.hpp" namespace xna { diff --git a/framework/platform-dx/texture.cpp b/framework/platform-dx/texture.cpp index a4955d1..8ae2d93 100644 --- a/framework/platform-dx/texture.cpp +++ b/framework/platform-dx/texture.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { static void setDefaultTexture2DDesc(Texture2D::PlatformImplementation& impl); diff --git a/framework/platform-dx/window.cpp b/framework/platform-dx/window.cpp index 3f54760..01d5589 100644 --- a/framework/platform-dx/window.cpp +++ b/framework/platform-dx/window.cpp @@ -1,4 +1,4 @@ -#include "xna/xna-dx.hpp" +#include "xna-dx/framework.hpp" namespace xna { GameWindow::GameWindow() { diff --git a/samples/01_blank/xna.cpp b/samples/01_blank/xna.cpp index 13b642b..6141a87 100644 --- a/samples/01_blank/xna.cpp +++ b/samples/01_blank/xna.cpp @@ -1,7 +1,6 @@ // xna.cpp : Defines the entry point for the application. // -#include "xna/xna.hpp" #include "xna-dx/framework.hpp" using namespace std;