diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-20 17:21:23 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-21 04:15:47 +0200 |
| commit | ebdae19fd226104baec712b9da9939ff82ef3c3a (patch) | |
| tree | e046c0f562fc4400480b2e3257f140e973a9ce6a /src/core/arm/dynarmic | |
| parent | Manually tweak source formatting and then re-run clang-format (diff) | |
| download | yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.bz2 yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.lz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.zst yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip | |
Diffstat (limited to 'src/core/arm/dynarmic')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 6 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index a521aec7c..b57d9e65b 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -2,12 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "core/arm/dynarmic/arm_dynarmic.h" +#include <dynarmic/dynarmic.h> #include "common/assert.h" #include "common/microprofile.h" - -#include <dynarmic/dynarmic.h> - -#include "core/arm/dynarmic/arm_dynarmic.h" #include "core/arm/dyncom/arm_dyncom_interpreter.h" #include "core/core.h" #include "core/core_timing.h" diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index d493cabd5..ced86d29b 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -5,11 +5,8 @@ #pragma once #include <memory> - #include <dynarmic/dynarmic.h> - #include "common/common_types.h" - #include "core/arm/arm_interface.h" #include "core/arm/skyeye_common/armstate.h" |