Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2019-04-04 21:54:35 +03:00
commit d623589c1c
2 changed files with 19 additions and 12 deletions

View File

@ -1,11 +1,16 @@
Xenia - Xbox 360 Emulator Research Project <p align="center">
========================================== <a href="https://github.com/xenia-project/xenia/tree/master/assets/icon">
<img height="370px" src="https://raw.githubusercontent.com/xenia-project/xenia/master/assets/icon/1024.png" />
</a>
</p>
Xenia is an experimental emulator for the Xbox 360. For more information see the <h1 align="center">Xenia - Xbox 360 Emulator</h1>
Xenia is an experimental emulator for the Xbox 360. For more information, see the
[main xenia website](https://xenia.jp/). [main xenia website](https://xenia.jp/).
**Interested in supporting the core contributors? **Interested in supporting the core contributors?** Visit
[Xenia Project on Patreon](https://www.patreon.com/xenia_project).** [Xenia Project on Patreon](https://www.patreon.com/xenia_project).
Come chat with us about **emulator-related topics** on [Discord](https://discord.gg/Q9mxZf9). Come chat with us about **emulator-related topics** on [Discord](https://discord.gg/Q9mxZf9).
For developer chat join `#dev` but stay on topic. Lurking is not only fine, but encouraged! For developer chat join `#dev` but stay on topic. Lurking is not only fine, but encouraged!
@ -21,9 +26,9 @@ Buildbot | Status
[Windows](https://ci.appveyor.com/project/benvanik/xenia/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/ftqiy86kdfawyx3a/branch/master?svg=true)](https://ci.appveyor.com/project/benvanik/xenia/branch/master) [Windows](https://ci.appveyor.com/project/benvanik/xenia/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/ftqiy86kdfawyx3a/branch/master?svg=true)](https://ci.appveyor.com/project/benvanik/xenia/branch/master)
[Linux](https://travis-ci.org/xenia-project/xenia) | [![Build status](https://travis-ci.org/xenia-project/xenia.svg?branch=master)](https://travis-ci.org/xenia-project/xenia) [Linux](https://travis-ci.org/xenia-project/xenia) | [![Build status](https://travis-ci.org/xenia-project/xenia.svg?branch=master)](https://travis-ci.org/xenia-project/xenia)
Some real games run. Most don't. Quite a few real games run. Quite a few don't.
See the [Game compatibility list](https://github.com/xenia-project/game-compatibility/issues) See the [Game compatibility list](https://github.com/xenia-project/game-compatibility/issues)
for currently tracked games and feel free to contribute your own updates, for currently tracked games, and feel free to contribute your own updates,
screenshots, and information there following the [existing conventions](https://github.com/xenia-project/game-compatibility/blob/master/README.md). screenshots, and information there following the [existing conventions](https://github.com/xenia-project/game-compatibility/blob/master/README.md).
## Disclaimer ## Disclaimer
@ -68,13 +73,11 @@ and be sure to run clang-format!
## Contributors Wanted! ## Contributors Wanted!
**Before contributing code or issues be sure to read [CONTRIBUTING.md](.github/CONTRIBUTING.md).**
Have some spare time, know advanced C++, and want to write an emulator? Have some spare time, know advanced C++, and want to write an emulator?
Contribute! There's a ton of work that needs to be done, a lot of which Contribute! There's a ton of work that needs to be done, a lot of which
is wide open greenfield fun. is wide open greenfield fun.
For general rules and guidelines please see [CONTRIBUTING.md](.github/CONTRIBUTING.md). **For general rules and guidelines please see [CONTRIBUTING.md](.github/CONTRIBUTING.md).**
Fixes and optimizations are always welcome (please!), but in addition to Fixes and optimizations are always welcome (please!), but in addition to
that there are some major work areas still untouched: that there are some major work areas still untouched:
@ -83,8 +86,7 @@ that there are some major work areas still untouched:
* Add input drivers for [PS4 controllers](https://github.com/xenia-project/xenia/issues/60) (or anything else) * Add input drivers for [PS4 controllers](https://github.com/xenia-project/xenia/issues/60) (or anything else)
* Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/xenia-project/xenia/labels/cross%20platform) * Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/xenia-project/xenia/labels/cross%20platform)
See more projects [good for contributors](https://github.com/xenia-project/xenia/labels/good%20first%20issue). It's a good idea to ask on Discord/the bugs before beginning work See more projects [good for contributors](https://github.com/xenia-project/xenia/labels/good%20first%20issue). It's a good idea to ask on Discord/check the issues before beginning work on something.
on something.
## FAQ ## FAQ

View File

@ -68,6 +68,11 @@ filter({"configurations:Debug", "platforms:Windows"})
"/NODEFAULTLIB:MSVCRTD", "/NODEFAULTLIB:MSVCRTD",
}) })
filter({"configurations:Debug", "platforms:Linux"})
buildoptions({
"-g",
})
filter("configurations:Release") filter("configurations:Release")
runtime("Release") runtime("Release")
defines({ defines({