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

Fixing build and removing old binary libav submodule.

This commit is contained in:
Ben Vanik 2015-08-29 21:04:26 -07:00
parent 764b11fa04
commit e7b46afa9d
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -10,9 +10,6 @@
[submodule "third_party/capstone"] [submodule "third_party/capstone"]
path = third_party/capstone path = third_party/capstone
url = https://github.com/xenia-project/capstone.git url = https://github.com/xenia-project/capstone.git
[submodule "third_party/libav-xma-bin"]
path = third_party/libav-xma-bin
url = https://github.com/xenia-project/libav-xma-bin.git
[submodule "third_party/elemental-forms"] [submodule "third_party/elemental-forms"]
path = third_party/elemental-forms path = third_party/elemental-forms
url = https://github.com/xenia-project/elemental-forms.git url = https://github.com/xenia-project/elemental-forms.git

2
src/xenia/apu/premake5.lua
View File

@ -14,8 +14,8 @@ project("xenia-apu")
defines({ defines({
}) })
includedirs({ includedirs({
project_root.."/third_party/libav/include/",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
project_root.."/third_party/libav/",
}) })
local_platform_files() local_platform_files()

6
src/xenia/apu/xma_context.cc
View File

@ -20,9 +20,9 @@
#include "xenia/profiling.h" #include "xenia/profiling.h"
extern "C" { extern "C" {
#include "libavcodec/avcodec.h" #include "third_party/libav/libavcodec/avcodec.h"
#include "libavcodec/xma2dec.h" #include "third_party/libav/libavcodec/xma2dec.h"
#include "libavutil/channel_layout.h" #include "third_party/libav/libavutil/channel_layout.h"
extern AVCodec ff_xma2_decoder; extern AVCodec ff_xma2_decoder;
} // extern "C" } // extern "C"

2
src/xenia/apu/xma_decoder.cc
View File

@ -22,7 +22,7 @@
#include "xenia/profiling.h" #include "xenia/profiling.h"
extern "C" { extern "C" {
#include "libavutil/log.h" #include "third_party/libav/libavutil/log.h"
} // extern "C" } // extern "C"
// As with normal Microsoft, there are like twelve different ways to access // As with normal Microsoft, there are like twelve different ways to access

2
third_party/libav vendored

@ -1 +1 @@
Subproject commit 8be22f03d7e3c1663a66cc09375f840a7fc9a365 Subproject commit c4ca82c2aeab50fa234ba41757bdf881d754ada8

1
third_party/libav-xma-bin vendored

@ -1 +0,0 @@
Subproject commit a703710ece1645a60b6648147927527f992b7fc1