ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2019-08-02 21:50:43 +03:00
parent e05f3288e4 3bcd1fb744
commit e071ca852c
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -7,9 +7,6 @@
[submodule "third_party/binutils-ppc-cygwin"] [submodule "third_party/binutils-ppc-cygwin"]
path = third_party/binutils-ppc-cygwin path = third_party/binutils-ppc-cygwin
url = https://github.com/benvanik/binutils-ppc-cygwin url = https://github.com/benvanik/binutils-ppc-cygwin
[submodule "third_party/capstone"]
path = third_party/capstone
url = https://github.com/xenia-project/capstone.git
[submodule "third_party/libav"] [submodule "third_party/libav"]
path = third_party/libav path = third_party/libav
url = https://github.com/xenia-project/libav.git url = https://github.com/xenia-project/libav.git
@ -49,3 +46,6 @@
[submodule "third_party/aes_128"] [submodule "third_party/aes_128"]
path = third_party/aes_128 path = third_party/aes_128
url = https://github.com/openluopworld/aes_128.git url = https://github.com/openluopworld/aes_128.git
[submodule "third_party/capstone"]
path = third_party/capstone
url = https://github.com/xenia-project/capstone.git

4
src/xenia/cpu/backend/x64/x64_assembler.cc
View File

@ -11,8 +11,8 @@
#include <climits> #include <climits>
#include "third_party/capstone/include/capstone.h" #include "third_party/capstone/include/capstone/capstone.h"
#include "third_party/capstone/include/x86.h" #include "third_party/capstone/include/capstone/x86.h"
#include "xenia/base/profiling.h" #include "xenia/base/profiling.h"
#include "xenia/base/reset_scope.h" #include "xenia/base/reset_scope.h"
#include "xenia/cpu/backend/x64/x64_backend.h" #include "xenia/cpu/backend/x64/x64_backend.h"

4
src/xenia/cpu/backend/x64/x64_backend.cc
View File

@ -11,8 +11,8 @@
#include <stddef.h> #include <stddef.h>
#include "third_party/capstone/include/capstone.h" #include "third_party/capstone/include/capstone/capstone.h"
#include "third_party/capstone/include/x86.h" #include "third_party/capstone/include/capstone/x86.h"
#include "xenia/base/exception_handler.h" #include "xenia/base/exception_handler.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"

4
src/xenia/debug/ui/debug_window.cc
View File

@ -15,8 +15,8 @@
#include <cinttypes> #include <cinttypes>
#include <utility> #include <utility>
#include "third_party/capstone/include/capstone.h" #include "third_party/capstone/include/capstone/capstone.h"
#include "third_party/capstone/include/x86.h" #include "third_party/capstone/include/capstone/x86.h"
#include "third_party/imgui/imgui.h" #include "third_party/imgui/imgui.h"
#include "third_party/imgui/imgui_internal.h" #include "third_party/imgui/imgui_internal.h"
#include "third_party/yaml-cpp/include/yaml-cpp/yaml.h" #include "third_party/yaml-cpp/include/yaml-cpp/yaml.h"

2
third_party/capstone vendored

@ -1 +1 @@
Subproject commit 121057635173f4da4ce26dd676c7470aef7bddce Subproject commit f9c6a90489be7b3637ff1c7298e45efafe7cf1b9

1
third_party/capstone.lua vendored
View File

@ -30,7 +30,6 @@ project("capstone")
"capstone/MCInstrDesc.h", "capstone/MCInstrDesc.h",
"capstone/MCRegisterInfo.c", "capstone/MCRegisterInfo.c",
"capstone/MCRegisterInfo.h", "capstone/MCRegisterInfo.h",
"capstone/myinttypes.h",
"capstone/SStream.c", "capstone/SStream.c",
"capstone/SStream.h", "capstone/SStream.h",
"capstone/utils.c", "capstone/utils.c",

2
third_party/discord-rpc vendored

@ -1 +1 @@
Subproject commit ba9fe00c4de1d680cdc56605d9c0d2b4cf8e7a07 Subproject commit eff23a770a07c3574cb48f299736c461c576286b

2
third_party/rapidjson vendored

@ -1 +1 @@
Subproject commit af223d44f4e8d3772cb1ac0ce8bc2a132b51717f Subproject commit d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5