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

Merge pull request #681 from Margen67/master 

Move CONTRIBUTING.md to .github, update Python 2.7 to latest, & change Github releases link to Appveyor artifacts
This commit is contained in:
Justin Moore 2017-03-19 20:05:59 -05:00 committed by GitHub
parent f012845cb6 9a1e956bf2
commit 0d466ad53e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CONTRIBUTING.md → .github/CONTRIBUTING.md vendored
View File

@ -26,9 +26,9 @@ could result in the project being terminated, so just don't do it.
## Style Guide ## Style Guide
Please read over [style_guide.md](docs/style_guide.md) before sending pull requests Please read over [style_guide.md](../docs/style_guide.md) before sending pull requests
and ensure your code is clean as the buildbot (or I) will make you to fix it :) and ensure your code is clean as the buildbot (or I) will make you to fix it :)
[style_guide.md](docs/style_guide.md) has information about using `xb format` and [style_guide.md](../docs/style_guide.md) has information about using `xb format` and
various IDE auto formatting tools so that you can avoid having to clean things various IDE auto formatting tools so that you can avoid having to clean things
up later, so be sure to check it out. up later, so be sure to check it out.
@ -62,10 +62,10 @@ things clean and easy.
# License # License
All xenia code is licensed under the 3-clause BSD license as detailed in All xenia code is licensed under the 3-clause BSD license as detailed in
[LICENSE](LICENSE). Code under `third_party/` is licensed under its original [LICENSE](../LICENSE). Code under `third_party/` is licensed under its original
license. license.
Incoming code in pull requests are subject to the xenia [LICENSE](LICENSE). Incoming code in pull requests are subject to the xenia [LICENSE](../LICENSE).
Once code comes into the codebase it is very difficult to ever fully remove so Once code comes into the codebase it is very difficult to ever fully remove so
copyright is ascribed to the project to prevent future disputes such as what copyright is ascribed to the project to prevent future disputes such as what
occurred in [Dolphin](https://dolphin-emu.org/blog/2015/05/25/relicensing-dolphin/). occurred in [Dolphin](https://dolphin-emu.org/blog/2015/05/25/relicensing-dolphin/).

10
README.md
View File

@ -66,13 +66,13 @@ and be sure to run clang-format!
## Contributors Wanted! ## Contributors Wanted!
**Before contributing code or issues be sure to read [CONTRIBUTING.md](CONTRIBUTING.md).** **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](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:
@ -81,7 +81,7 @@ that there are some major work areas still untouched:
* Add input drivers for [PS4 controllers](https://github.com/benvanik/xenia/issues/60) (or anything else) * Add input drivers for [PS4 controllers](https://github.com/benvanik/xenia/issues/60) (or anything else)
* Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/benvanik/xenia/labels/cross%20platform) * Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/benvanik/xenia/labels/cross%20platform)
See more projects [good for contributors](https://github.com/benvanik/xenia/issues?labels=good+for+contributors&page=1&state=open). It's a good idea to ask on IRC/the bugs before beginning work See more projects [good for contributors](https://github.com/benvanik/xenia/labels/good%20for%20contributors). It's a good idea to ask on IRC/the bugs before beginning work
on something. on something.
## FAQ ## FAQ
@ -90,5 +90,5 @@ For more see the main [frequently asked questions](http://xenia.jp/faq/) page.
### Can I get an exe? ### Can I get an exe?
Check the [Releases](https://github.com/benvanik/xenia/releases) tab to see Check [Appveyor's artifacts](https://ci.appveyor.com/project/benvanik/xenia/build/artifacts) to see
what's there. Updated irregularly. what's there.

2
docs/building.md
View File

@ -10,7 +10,7 @@ video drivers for your card.
* Windows 8 or 8.1 * Windows 8 or 8.1
* Visual Studio 2015 * Visual Studio 2015
* [Python 2.7](http://www.python.org/download/releases/2.7.6/) * [Python 2.7](https://www.python.org/downloads/release/python-2713/)
* If you are on Windows 8, you will also need the [Windows 8.1 SDK](http://msdn.microsoft.com/en-us/windows/desktop/bg162891) * If you are on Windows 8, you will also need the [Windows 8.1 SDK](http://msdn.microsoft.com/en-us/windows/desktop/bg162891)
Ensure Python is in your PATH (`C:\Python27\`). Ensure Python is in your PATH (`C:\Python27\`).

2
xb.bat
View File

@ -11,7 +11,7 @@ CALL :check_python
IF %_RESULT% NEQ 0 ( IF %_RESULT% NEQ 0 (
ECHO. ECHO.
ECHO Python 2.7 must be installed and on PATH: ECHO Python 2.7 must be installed and on PATH:
ECHO https://www.python.org/ftp/python/2.7.12/python-2.7.12.msi ECHO https://www.python.org/ftp/python/2.7.13/python-2.7.13.msi
GOTO :exit_error GOTO :exit_error
) )