diff options
| author | Jason Maskell <[email protected]> | 2016-05-23 10:49:51 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-23 10:49:51 +0200 |
| commit | 0837eb3bd53eccc2c9c1f949e4031d758654c3f5 (patch) | |
| tree | 17bd2839b74f7f498b22b22370bb5b7afed6ea17 /sample/d3d11/sample_d3d11.cpp | |
| parent | Sample now compiles cleanly, doesn't run yet due to media path issues. (diff) | |
| download | waveworks_archive-0837eb3bd53eccc2c9c1f949e4031d758654c3f5.tar.xz waveworks_archive-0837eb3bd53eccc2c9c1f949e4031d758654c3f5.zip | |
Moved media to a more central location.
Changed CMake to compile shaders to that new location.
Diffstat (limited to 'sample/d3d11/sample_d3d11.cpp')
| -rw-r--r-- | sample/d3d11/sample_d3d11.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sample/d3d11/sample_d3d11.cpp b/sample/d3d11/sample_d3d11.cpp index ff5a1f2..20c2a1c 100644 --- a/sample/d3d11/sample_d3d11.cpp +++ b/sample/d3d11/sample_d3d11.cpp @@ -43,6 +43,10 @@ #include "D3DX11Effect.h" #include "D3D9types.h" +#include <locale> +#include <codecvt> +#include <xlocbuf> + //#define DEBUG_VS // Uncomment this line to debug vertex shaders //#define DEBUG_PS // Uncomment this line to debug pixel shaders @@ -204,6 +208,14 @@ INT WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR cmdline, int ) #if defined(DEBUG) | defined(_DEBUG) _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); #endif + + //TODO: Take from cmdline + auto mediaPath = "..\\..\\media\\sample"; + + std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter; + DXUTSetMediaSearchPath(converter.from_bytes(mediaPath).c_str()); + + // Set the callback functions. These functions allow DXUT to notify // the application about device changes, user input, and windows messages. The // callbacks are optional so you need only set callbacks for events you're interested |