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

2015-04-12 15:22:58 -04:00 · 2015-04-12 15:22:58 -04:00 · b618f2baa7
parent ebdf15c17c 4479bf5d55
commit b618f2baa7
2 changed files with 8 additions and 1 deletions
--- a/gfx/drivers_context/d3d_ctx.cpp
+++ b/gfx/drivers_context/d3d_ctx.cpp
@ -15,6 +15,10 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

+#ifdef _XBOX
+#include <xtl.h>
+#endif
+
 #include "../d3d/d3d.h"
 #include "../common/win32_common.h"

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