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

Merge branch 'master' of github.com:fr500/RetroArch

This commit is contained in:
Radius 2015-04-12 15:22:58 -04:00
parent ebdf15c17c 4479bf5d55
commit b618f2baa7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_context/d3d_ctx.cpp
View File

@ -15,6 +15,10 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef _XBOX
#include <xtl.h>
#endif
#include "../d3d/d3d.h" #include "../d3d/d3d.h"
#include "../common/win32_common.h" #include "../common/win32_common.h"

3
msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
View File

@ -447,6 +447,9 @@
CompileAs="2"/> CompileAs="2"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\griffin\griffin_cpp.cpp">
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"