diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-02 13:24:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-02 13:24:21 (GMT) |
| commit | 067b21b675bde6ccbb3009fbaaba5efaa78dbea0 (patch) | |
| tree | b5d16fda018cafbbdeef8587b46a323feda1374b /Tests/VSWinStorePhone/Direct3DApp1 | |
| parent | 2e6684c65da317d0ffdb383bff895635c2947826 (diff) | |
| parent | e1c7747253ac71a5215dd32a910b62a1fd8c561a (diff) | |
| download | CMake-067b21b675bde6ccbb3009fbaaba5efaa78dbea0.zip CMake-067b21b675bde6ccbb3009fbaaba5efaa78dbea0.tar.gz CMake-067b21b675bde6ccbb3009fbaaba5efaa78dbea0.tar.bz2 | |
Merge topic 'clang-format-include-order'
e1c77472 Format include directive blocks and ordering with clang-format
180538c7 Source: Stabilize include order
0e7bca92 Utilities/Release: Stabilize include order in WiX custom action
eb817be0 Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone
eda313b4 Tests: Stabilize include order in StringFileTest
7110b754 CursesDialog: add missing cmState include
d7a5f255 Modules: Remove unused CMakeTestWatcomVersion.c file
Diffstat (limited to 'Tests/VSWinStorePhone/Direct3DApp1')
6 files changed, 9 insertions, 5 deletions
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp index f4827f2..7632388 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp @@ -1,4 +1,5 @@ #include "pch.h" + #include "CubeRenderer.h" using namespace DirectX; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp index 3dbb97f..41ca124 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp @@ -1,6 +1,7 @@ #include "pch.h" -#include "Direct3DApp1.h" + #include "BasicTimer.h" +#include "Direct3DApp1.h" using namespace Windows::ApplicationModel; using namespace Windows::ApplicationModel::Core; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h index 40b69a1..6861e44 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h @@ -1,6 +1,7 @@ #pragma once #include "pch.h" + #include "CubeRenderer.h" ref class Direct3DApp1 sealed : public Windows::ApplicationModel::Core::IFrameworkView diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp index 46727b5..f09c8da 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp @@ -1,4 +1,5 @@ #include "pch.h" + #include "Direct3DBase.h" using namespace DirectX; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h index d411a9b..3434ba9 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h @@ -1,8 +1,8 @@ #pragma once -#include <wrl/client.h> #include <ppl.h> #include <ppltasks.h> +#include <wrl/client.h> namespace DX { diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h index 2302e66..78ebea3 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h @@ -1,7 +1,7 @@ #pragma once -#include <wrl/client.h> -#include <d3d11_1.h> #include <DirectXMath.h> -#include <memory> #include <agile.h> +#include <d3d11_1.h> +#include <memory> +#include <wrl/client.h> |