From 05c7d4e573c8f379fa1350e97f2eb60c402c7fd0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 12 Sep 2014 08:02:50 +0200
Subject: [PATCH] (D3D/MSVC) Build fix and include d3d_wrapper.c for MSVC build

---
 gfx/d3d9/d3d_wrapper.c                        |  28 +-
 gfx/d3d9/d3d_wrapper.h                        |   4 +-
 gfx/d3d9/render_chain.cpp                     |   2 +-
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj     |   3 +-
 .../RetroArch-msvc2010.vcxproj.filters        | 982 +++++++++---------
 5 files changed, 521 insertions(+), 498 deletions(-)

diff --git a/gfx/d3d9/d3d_wrapper.c b/gfx/d3d9/d3d_wrapper.c
index f6733f200c..aa1680896d 100644
--- a/gfx/d3d9/d3d_wrapper.c
+++ b/gfx/d3d9/d3d_wrapper.c
@@ -14,10 +14,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "d3d.hpp"
 #include "d3d_wrapper.h"
+#include "render_chain.hpp"
 
-void d3d_swap(d3d_video_t *d3d, LPDIRECT3DDEVICE dev)
+void d3d_swap(void *data, LPDIRECT3DDEVICE dev)
 {
+   d3d_video_t *d3d = (d3d_video_t*)data;
+
+   if (!d3d)
+	   return;
+
 #if defined(_XBOX1)
    D3DDevice_Swap(0);
 #elif defined(_XBOX360)
@@ -56,7 +63,7 @@ void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no,
    D3DDevice_SetStreamSource_Inline(dev, stream_no, stream_vertbuf,
          offset_bytes, stride);
 #else
-   dev->SetStreamSource(steam_no, stream_vertbuf, offset_bytes, stride);
+   dev->SetStreamSource(stream_no, stream_vertbuf, offset_bytes, stride);
 #endif
 }
 
@@ -137,7 +144,7 @@ void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex,
    D3DTexture_LockRect(tex, level, &lock_rect, &rect, flags);
    memset(lock_rect.pBits, 0, tex_height * lock_rect.Pitch);
 #else
-   if (SUCCEEDED(tex->LockRect(level, &lock_rect, rect, flags)))
+   if (SUCCEEDED(tex->LockRect(level, &lock_rect, &rect, flags)))
    {
       memset(lock_rect.pBits, level, tex_height * lock_rect.Pitch);
       tex->UnlockRect(0);
@@ -145,12 +152,18 @@ void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex,
 #endif
 }
 
-void d3d_textureblit(d3d_video_t *d3d,
+void d3d_textureblit(void *data, void *renderchain_data,
       LPDIRECT3DTEXTURE tex, D3DSURFACE_DESC desc,
       D3DLOCKED_RECT lr, const void *frame,
       unsigned width, unsigned height, unsigned pitch)
 {
+	d3d_video_t *d3d = (d3d_video_t*)d3d;
    (void)desc;
+   (void)d3d;
+
+   if (!d3d)
+	   return;
+
 #if defined(_XBOX360)
    tex->GetLevelDesc(0, &desc);
    XGCopySurface(lr.pBits, lr.Pitch, width, height, desc.Format, NULL,
@@ -163,13 +176,18 @@ void d3d_textureblit(d3d_video_t *d3d,
       memcpy(out, in, width * d3d->pixel_size);
    }
 #else
+   renderchain_t *chain = (renderchain_t*)renderchain_data;
+
+   if (!chain)
+	   return;
+
    if (SUCCEEDED(tex->LockRect(0, &lr, NULL, D3DLOCK_NOSYSLOCK)))
    {
       for (unsigned y = 0; y < height; y++)
       { 
          const uint8_t *in = (const uint8_t*)frame + y * pitch;
          uint8_t *out = (uint8_t*)lr.pBits + y * lr.Pitch;
-         memcpy(out, in, width * d3d->pixel_size);
+         memcpy(out, in, width * chain->pixel_size);
       }
       tex->UnlockRect(0);
    }
diff --git a/gfx/d3d9/d3d_wrapper.h b/gfx/d3d9/d3d_wrapper.h
index f6a3e75880..8bf642d73a 100644
--- a/gfx/d3d9/d3d_wrapper.h
+++ b/gfx/d3d9/d3d_wrapper.h
@@ -20,7 +20,7 @@
 #include "../context/win32_common.h"
 #include "d3d_defines.h"
 
-void d3d_swap(d3d_video_t *d3d, LPDIRECT3DDEVICE dev);
+void d3d_swap(void *data, LPDIRECT3DDEVICE dev);
 
 HRESULT d3d_create_vertex_buffer(LPDIRECT3DDEVICE dev,
       unsigned length, unsigned usage, unsigned fvf,
@@ -50,7 +50,7 @@ void d3d_lockrectangle_clear(LPDIRECT3DTEXTURE tex,
       unsigned level, D3DLOCKED_RECT lock_rect, RECT rect,
       unsigned flags);
 
-void d3d_textureblit(d3d_video_t *d3d,
+void d3d_textureblit(void *data,
       LPDIRECT3DTEXTURE tex, D3DSURFACE_DESC desc,
       D3DLOCKED_RECT lr, const void *frame,
       unsigned width, unsigned height, unsigned pitch);
diff --git a/gfx/d3d9/render_chain.cpp b/gfx/d3d9/render_chain.cpp
index 2359affcf0..d3f7812f14 100644
--- a/gfx/d3d9/render_chain.cpp
+++ b/gfx/d3d9/render_chain.cpp
@@ -161,7 +161,7 @@ bool renderchain_add_pass(void *data, const LinkInfo *info)
                ? D3DUSAGE_SOFTWAREPROCESSING : 0,
                0,
                D3DPOOL_DEFAULT,
-               &pass.vertex_buf,
+               pass.vertex_buf,
                NULL)))
       return false;
 
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 3bc0a7e43f..f30852001b 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -219,6 +219,7 @@
     <ClCompile Include="..\..\deps\rzlib\unzip.c" />
     <ClCompile Include="..\..\deps\rzlib\zutil.c" />
     <ClCompile Include="..\..\file_extract.c" />
+    <ClCompile Include="..\..\gfx\d3d9\d3d_wrapper.c" />
     <ClCompile Include="..\..\playlist.c" />
     <ClCompile Include="..\..\file_list.c" />
     <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c" />
@@ -423,4 +424,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index c9ace06b72..2d78673129 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -1,490 +1,494 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\autosave.c" />
-    <ClCompile Include="..\..\cheats.c" />
-    <ClCompile Include="..\..\core_options.c" />
-    <ClCompile Include="..\..\file_extract.c" />
-    <ClCompile Include="..\..\performance.c" />
-    <ClCompile Include="..\..\command.c" />
-    <ClCompile Include="..\..\conf\config_file.c" />
-    <ClCompile Include="..\..\driver.c" />
-    <ClCompile Include="..\..\dynamic.c" />
-    <ClCompile Include="..\..\dynamic_dummy.c" />
-    <ClCompile Include="..\..\fifo_buffer.c" />
-    <ClCompile Include="..\..\file.c" />
-    <ClCompile Include="..\..\file_path.c" />
-    <ClCompile Include="..\..\hash.c" />
-    <ClCompile Include="..\..\message_queue.c" />
-    <ClCompile Include="..\..\movie.c" />
-    <ClCompile Include="..\..\netplay.c" />
-    <ClCompile Include="..\..\patch.c" />
-    <ClCompile Include="..\..\retroarch.c" />
-    <ClCompile Include="..\..\location\nulllocation.c" />
-    <ClCompile Include="..\..\camera\nullcamera.c" />
-    <ClCompile Include="..\..\gfx\nullgfx.c" />
-    <ClCompile Include="..\..\rewind.c" />
-    <ClCompile Include="..\..\screenshot.c" />
-    <ClCompile Include="..\..\settings.c" />
-    <ClCompile Include="..\..\thread.c" />
-    <ClCompile Include="..\..\gfx\gfx_common.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\gfx_context.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\gl.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\menu\menu_common.c">
-      <Filter>frontend\menu</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\menu\disp\rgui.c">
-      <Filter>frontend\menu\disp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\glsym\rglgen.c">
-      <Filter>gfx\glsym</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\glsym\glsym_gl.c">
-      <Filter>gfx\glsym</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\resamplers\sinc.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\utils.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\resamplers\resampler.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\math\matrix.c">
-      <Filter>gfx\math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\math\matrix_3x3.c">
-      <Filter>gfx\math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\shader_cg.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\shader_glsl.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\state_tracker.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\shader_parse.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\context\wgl_ctx.c">
-      <Filter>gfx\context</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\dsound.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\xaudio-c\xaudio-c.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\xaudio.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\input\dinput.c">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\input\osk\nullosk.c">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\input\winxinput_joypad.c">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\input\keyboard_line.c">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\thread_wrapper.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\video_thread_wrapper.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\rpng\rpng.c">
-      <Filter>gfx\rpng</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\input\input_common.c">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\compat\compat.c">
-      <Filter>compat</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\frontend.c">
-      <Filter>frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\frontend_context.c">
-      <Filter>frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\scaler\pixconv.c">
-      <Filter>gfx\scaler</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\scaler\scaler.c">
-      <Filter>gfx\scaler</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\scaler\scaler_int.c">
-      <Filter>gfx\scaler</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\scaler\scaler_filter.c">
-      <Filter>gfx\scaler</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp">
-      <Filter>gfx\d3d9</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\compat\rxml\rxml.c">
-      <Filter>compat\rxml</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\input\autoconf\builtin_win.c">
-      <Filter>input\autoconf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\d3d9\d3d.cpp">
-      <Filter>gfx\d3d9</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\zutil.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\adler32.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\compress.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\crc32.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\deflate.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\gzclose.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\gzlib.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\gzread.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\gzwrite.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\inffast.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\inflate.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\inftrees.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\ioapi.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\trees.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\uncompr.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\deps\rzlib\unzip.c">
-      <Filter>deps\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\fonts\d3d_font.c">
-      <Filter>gfx\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\fonts\fonts.c">
-      <Filter>gfx\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\fonts\bitmapfont.c">
-      <Filter>gfx\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\fonts\d3d_w32_font.cpp">
-      <Filter>gfx\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\fonts\gl_font.c">
-      <Filter>gfx\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\fonts\gl_raster_font.c">
-      <Filter>gfx\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\input\overlay.c">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\menu\menu_input_line_cb.c">
-      <Filter>frontend\menu</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\menu\menu_entries.c">
-      <Filter>frontend\menu</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\menu\menu_navigation.c">
-      <Filter>frontend\menu</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp">
-      <Filter>gfx\context</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\filter.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\resamplers\cc_resampler.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c">
-      <Filter>frontend\menu\backend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\shader_common.c">
-      <Filter>gfx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\frontend\platform\platform_null.c">
-      <Filter>frontend\platform</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\image\image_rpng.c">
-      <Filter>gfx\image</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\audio\dsp_filter.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\playlist.c" />
-    <ClCompile Include="..\..\file_list.c" />
-    <ClCompile Include="..\..\core_info.c" />
-    <ClCompile Include="..\..\audio\nullaudio.c" />
-    <ClCompile Include="..\..\input\nullinput.c" />
-    <ClCompile Include="..\..\settings_data.c" />
-    <ClCompile Include="..\..\record\ffemu.c">
-      <Filter>record</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gfx\context\win32_common.c">
-      <Filter>gfx\context</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="..\..\retroarch_logger.h" />
-    <ClInclude Include="..\..\autosave.h" />
-    <ClInclude Include="..\..\cheats.h" />
-    <ClInclude Include="..\..\command.h" />
-    <ClInclude Include="..\..\core_info.h" />
-    <ClInclude Include="..\..\core_options.h" />
-    <ClInclude Include="..\..\driver.h" />
-    <ClInclude Include="..\..\dynamic.h" />
-    <ClInclude Include="..\..\dynamic_dummy.h" />
-    <ClInclude Include="..\..\file.h" />
-    <ClInclude Include="..\..\file_extract.h" />
-    <ClInclude Include="..\..\fifo_buffer.h" />
-    <ClInclude Include="..\..\file_list.h" />
-    <ClInclude Include="..\..\file_path.h" />
-    <ClInclude Include="..\..\hash.h" />
-    <ClInclude Include="..\..\rewind.h" />
-    <ClInclude Include="..\..\screenshot.h" />
-    <ClInclude Include="..\..\settings_data.h" />
-    <ClInclude Include="..\..\thread.h" />
-    <ClInclude Include="..\..\message_queue.h" />
-    <ClInclude Include="..\..\movie.h" />
-    <ClInclude Include="..\..\netplay.h" />
-    <ClInclude Include="..\..\patch.h" />
-    <ClInclude Include="..\..\performance.h" />
-    <ClInclude Include="..\..\playlist.h" />
-    <ClInclude Include="..\..\audio\resamplers\resampler.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\audio\thread_wrapper.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\audio\utils.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\audio\dsp_filter.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\compat\rxml\rxml.h">
-      <Filter>compat\rxml</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\frontend.h">
-      <Filter>frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\frontend_context.h">
-      <Filter>frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\menu\menu_navigation.h">
-      <Filter>frontend\menu</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\menu\menu_common.h">
-      <Filter>frontend\menu</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\menu\menu_entries.h">
-      <Filter>frontend\menu</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\menu\menu_input_line_cb.h">
-      <Filter>frontend\menu</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\menu\backend\menu_common_backend.h">
-      <Filter>frontend\menu\backend</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\frontend\menu\disp\shared.h">
-      <Filter>frontend\menu\disp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\shader_cg.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\shader_common.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\shader_glsl.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\shader_parse.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\state_tracker.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\filter.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\gfx_common.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\gfx_context.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\gl_common.h">
-      <Filter>gfx</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\d3d9\d3d.hpp">
-      <Filter>gfx\d3d9</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\d3d9\render_chain.hpp">
-      <Filter>gfx\d3d9</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\fonts\gl_font.h">
-      <Filter>gfx\fonts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\fonts\d3d_font.h">
-      <Filter>gfx\fonts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\fonts\fonts.h">
-      <Filter>gfx\fonts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\glsym\rglgen.h">
-      <Filter>gfx\glsym</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\glsym\glsym_gl.h">
-      <Filter>gfx\glsym</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\image\image.h">
-      <Filter>gfx\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\math\matrix_3x3.h">
-      <Filter>gfx\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\math\matrix.h">
-      <Filter>gfx\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\rpng\rpng.h">
-      <Filter>gfx\rpng</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\scaler\scaler_common.h">
-      <Filter>gfx\scaler</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\scaler\scaler_int.h">
-      <Filter>gfx\scaler</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\scaler\pixconv.h">
-      <Filter>gfx\scaler</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\scaler\scaler.h">
-      <Filter>gfx\scaler</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\input\input_common.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\input\keyboard_line.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\input\autoconf\builtin.h">
-      <Filter>input\autoconf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\input\overlay.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gfx\context\win32_common.h">
-      <Filter>gfx\context</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\record\ffemu.h">
-      <Filter>record</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\media\rarch.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="gfx">
-      <UniqueIdentifier>{8e47cc2f-ec74-4943-b7b7-156705b5d06e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="frontend">
-      <UniqueIdentifier>{70d71fcb-ca47-4008-a027-26ed3eaa1f16}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="frontend\menu">
-      <UniqueIdentifier>{6a00f197-1398-4044-bbf1-ee767df7a2ee}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="frontend\menu\disp">
-      <UniqueIdentifier>{45fc4432-da59-4c73-a194-1fd2155489bc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\glsym">
-      <UniqueIdentifier>{98e75d1b-5c77-4e09-ba68-248974772850}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="audio">
-      <UniqueIdentifier>{a4e2c91e-3109-4ef9-a5ae-a42dc713c499}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\d3d9">
-      <UniqueIdentifier>{f2f1e12e-ac10-4b0e-aa95-7a4b6a555d44}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\math">
-      <UniqueIdentifier>{c5041859-b61d-41bb-8f3a-f596248b1132}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\context">
-      <UniqueIdentifier>{46e89489-2413-4645-aef3-66c7d9dd9dca}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="input">
-      <UniqueIdentifier>{c7cbb180-c629-4897-89f0-a4298eaf5f27}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\rpng">
-      <UniqueIdentifier>{a6b082bc-7b37-4715-8d02-701cc9acae5c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="compat">
-      <UniqueIdentifier>{6489e28b-b1bf-45a3-ab30-4d9a3e68c57b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\fonts">
-      <UniqueIdentifier>{21c771b7-6971-4953-83d7-d1f83239d490}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\scaler">
-      <UniqueIdentifier>{8cc14084-f5b9-4166-81ac-3f66afd6527d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="compat\rxml">
-      <UniqueIdentifier>{c2ea7f2b-5a09-4f28-8bbe-a628bd3a0bdd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="input\autoconf">
-      <UniqueIdentifier>{a923ed53-ddfb-47d1-a5e7-ec6105c4bd79}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="deps">
-      <UniqueIdentifier>{d1a36d53-e5e6-46a5-b5b4-b43794342cd1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="deps\zlib">
-      <UniqueIdentifier>{cf7c2fb9-ca3c-468e-af4f-74c652b3e5fe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="frontend\menu\backend">
-      <UniqueIdentifier>{dd1ca879-56f4-43f6-8bd8-ae50222061e8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="frontend\platform">
-      <UniqueIdentifier>{09d78055-1c93-4f12-ae3e-97aaa90cf78f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gfx\image">
-      <UniqueIdentifier>{4a5338d9-92ad-4d07-bb1a-97bd6eb475e4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="record">
-      <UniqueIdentifier>{5a80dd03-b4d7-4118-92ff-55a601fd80fc}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\autosave.c" />
+    <ClCompile Include="..\..\cheats.c" />
+    <ClCompile Include="..\..\core_options.c" />
+    <ClCompile Include="..\..\file_extract.c" />
+    <ClCompile Include="..\..\performance.c" />
+    <ClCompile Include="..\..\command.c" />
+    <ClCompile Include="..\..\conf\config_file.c" />
+    <ClCompile Include="..\..\driver.c" />
+    <ClCompile Include="..\..\dynamic.c" />
+    <ClCompile Include="..\..\dynamic_dummy.c" />
+    <ClCompile Include="..\..\fifo_buffer.c" />
+    <ClCompile Include="..\..\file.c" />
+    <ClCompile Include="..\..\file_path.c" />
+    <ClCompile Include="..\..\hash.c" />
+    <ClCompile Include="..\..\message_queue.c" />
+    <ClCompile Include="..\..\movie.c" />
+    <ClCompile Include="..\..\netplay.c" />
+    <ClCompile Include="..\..\patch.c" />
+    <ClCompile Include="..\..\retroarch.c" />
+    <ClCompile Include="..\..\location\nulllocation.c" />
+    <ClCompile Include="..\..\camera\nullcamera.c" />
+    <ClCompile Include="..\..\gfx\nullgfx.c" />
+    <ClCompile Include="..\..\rewind.c" />
+    <ClCompile Include="..\..\screenshot.c" />
+    <ClCompile Include="..\..\settings.c" />
+    <ClCompile Include="..\..\thread.c" />
+    <ClCompile Include="..\..\gfx\gfx_common.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\gfx_context.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\gl.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\menu\menu_common.c">
+      <Filter>frontend\menu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\menu\disp\rgui.c">
+      <Filter>frontend\menu\disp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\glsym\rglgen.c">
+      <Filter>gfx\glsym</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\glsym\glsym_gl.c">
+      <Filter>gfx\glsym</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\resamplers\sinc.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\utils.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\resamplers\resampler.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\math\matrix.c">
+      <Filter>gfx\math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\math\matrix_3x3.c">
+      <Filter>gfx\math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\shader_cg.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\shader_glsl.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\state_tracker.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\shader_parse.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\context\wgl_ctx.c">
+      <Filter>gfx\context</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\dsound.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\xaudio-c\xaudio-c.cpp">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\xaudio.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\input\dinput.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\input\osk\nullosk.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\input\winxinput_joypad.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\input\keyboard_line.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\thread_wrapper.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\video_thread_wrapper.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\rpng\rpng.c">
+      <Filter>gfx\rpng</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\input\input_common.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\compat\compat.c">
+      <Filter>compat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\frontend.c">
+      <Filter>frontend</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\frontend_context.c">
+      <Filter>frontend</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\scaler\pixconv.c">
+      <Filter>gfx\scaler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\scaler\scaler.c">
+      <Filter>gfx\scaler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\scaler\scaler_int.c">
+      <Filter>gfx\scaler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\scaler\scaler_filter.c">
+      <Filter>gfx\scaler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp">
+      <Filter>gfx\d3d9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\compat\rxml\rxml.c">
+      <Filter>compat\rxml</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\input\autoconf\builtin_win.c">
+      <Filter>input\autoconf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\d3d9\d3d.cpp">
+      <Filter>gfx\d3d9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\zutil.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\adler32.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\compress.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\crc32.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\deflate.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\gzclose.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\gzlib.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\gzread.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\gzwrite.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\inffast.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\inflate.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\inftrees.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\ioapi.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\trees.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\uncompr.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\deps\rzlib\unzip.c">
+      <Filter>deps\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\d3d_font.c">
+      <Filter>gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\fonts.c">
+      <Filter>gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\bitmapfont.c">
+      <Filter>gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\d3d_w32_font.cpp">
+      <Filter>gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\gl_font.c">
+      <Filter>gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\gl_raster_font.c">
+      <Filter>gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\input\overlay.c">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\menu\menu_input_line_cb.c">
+      <Filter>frontend\menu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\menu\menu_entries.c">
+      <Filter>frontend\menu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\menu\menu_navigation.c">
+      <Filter>frontend\menu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp">
+      <Filter>gfx\context</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\filter.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\resamplers\cc_resampler.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c">
+      <Filter>frontend\menu\backend</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\shader_common.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\platform\platform_null.c">
+      <Filter>frontend\platform</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\image\image_rpng.c">
+      <Filter>gfx\image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\dsp_filter.c">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\playlist.c" />
+    <ClCompile Include="..\..\file_list.c" />
+    <ClCompile Include="..\..\core_info.c" />
+    <ClCompile Include="..\..\audio\nullaudio.c" />
+    <ClCompile Include="..\..\input\nullinput.c" />
+    <ClCompile Include="..\..\settings_data.c" />
+    <ClCompile Include="..\..\record\ffemu.c">
+      <Filter>record</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\context\win32_common.c">
+      <Filter>gfx\context</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\frontend\menu\menu_action.c" />
+    <ClCompile Include="..\..\gfx\d3d9\d3d_wrapper.c">
+      <Filter>gfx\d3d9</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\retroarch_logger.h" />
+    <ClInclude Include="..\..\autosave.h" />
+    <ClInclude Include="..\..\cheats.h" />
+    <ClInclude Include="..\..\command.h" />
+    <ClInclude Include="..\..\core_info.h" />
+    <ClInclude Include="..\..\core_options.h" />
+    <ClInclude Include="..\..\driver.h" />
+    <ClInclude Include="..\..\dynamic.h" />
+    <ClInclude Include="..\..\dynamic_dummy.h" />
+    <ClInclude Include="..\..\file.h" />
+    <ClInclude Include="..\..\file_extract.h" />
+    <ClInclude Include="..\..\fifo_buffer.h" />
+    <ClInclude Include="..\..\file_list.h" />
+    <ClInclude Include="..\..\file_path.h" />
+    <ClInclude Include="..\..\hash.h" />
+    <ClInclude Include="..\..\rewind.h" />
+    <ClInclude Include="..\..\screenshot.h" />
+    <ClInclude Include="..\..\settings_data.h" />
+    <ClInclude Include="..\..\thread.h" />
+    <ClInclude Include="..\..\message_queue.h" />
+    <ClInclude Include="..\..\movie.h" />
+    <ClInclude Include="..\..\netplay.h" />
+    <ClInclude Include="..\..\patch.h" />
+    <ClInclude Include="..\..\performance.h" />
+    <ClInclude Include="..\..\playlist.h" />
+    <ClInclude Include="..\..\audio\resamplers\resampler.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\audio\thread_wrapper.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\audio\utils.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\audio\dsp_filter.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\compat\rxml\rxml.h">
+      <Filter>compat\rxml</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\frontend.h">
+      <Filter>frontend</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\frontend_context.h">
+      <Filter>frontend</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\menu\menu_navigation.h">
+      <Filter>frontend\menu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\menu\menu_common.h">
+      <Filter>frontend\menu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\menu\menu_entries.h">
+      <Filter>frontend\menu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\menu\menu_input_line_cb.h">
+      <Filter>frontend\menu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\menu\backend\menu_common_backend.h">
+      <Filter>frontend\menu\backend</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\menu\disp\shared.h">
+      <Filter>frontend\menu\disp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\shader_cg.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\shader_common.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\shader_glsl.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\shader_parse.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\state_tracker.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\filter.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\gfx_common.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\gfx_context.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\gl_common.h">
+      <Filter>gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\d3d9\d3d.hpp">
+      <Filter>gfx\d3d9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\d3d9\render_chain.hpp">
+      <Filter>gfx\d3d9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\fonts\gl_font.h">
+      <Filter>gfx\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\fonts\d3d_font.h">
+      <Filter>gfx\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\fonts\fonts.h">
+      <Filter>gfx\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\glsym\rglgen.h">
+      <Filter>gfx\glsym</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\glsym\glsym_gl.h">
+      <Filter>gfx\glsym</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\image\image.h">
+      <Filter>gfx\image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\math\matrix_3x3.h">
+      <Filter>gfx\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\math\matrix.h">
+      <Filter>gfx\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\rpng\rpng.h">
+      <Filter>gfx\rpng</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\scaler\scaler_common.h">
+      <Filter>gfx\scaler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\scaler\scaler_int.h">
+      <Filter>gfx\scaler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\scaler\pixconv.h">
+      <Filter>gfx\scaler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\scaler\scaler.h">
+      <Filter>gfx\scaler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\input\input_common.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\input\keyboard_line.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\input\autoconf\builtin.h">
+      <Filter>input\autoconf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\input\overlay.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gfx\context\win32_common.h">
+      <Filter>gfx\context</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\record\ffemu.h">
+      <Filter>record</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\media\rarch.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="gfx">
+      <UniqueIdentifier>{8e47cc2f-ec74-4943-b7b7-156705b5d06e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend">
+      <UniqueIdentifier>{70d71fcb-ca47-4008-a027-26ed3eaa1f16}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\menu">
+      <UniqueIdentifier>{6a00f197-1398-4044-bbf1-ee767df7a2ee}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\menu\disp">
+      <UniqueIdentifier>{45fc4432-da59-4c73-a194-1fd2155489bc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\glsym">
+      <UniqueIdentifier>{98e75d1b-5c77-4e09-ba68-248974772850}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="audio">
+      <UniqueIdentifier>{a4e2c91e-3109-4ef9-a5ae-a42dc713c499}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\d3d9">
+      <UniqueIdentifier>{f2f1e12e-ac10-4b0e-aa95-7a4b6a555d44}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\math">
+      <UniqueIdentifier>{c5041859-b61d-41bb-8f3a-f596248b1132}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\context">
+      <UniqueIdentifier>{46e89489-2413-4645-aef3-66c7d9dd9dca}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="input">
+      <UniqueIdentifier>{c7cbb180-c629-4897-89f0-a4298eaf5f27}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\rpng">
+      <UniqueIdentifier>{a6b082bc-7b37-4715-8d02-701cc9acae5c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="compat">
+      <UniqueIdentifier>{6489e28b-b1bf-45a3-ab30-4d9a3e68c57b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\fonts">
+      <UniqueIdentifier>{21c771b7-6971-4953-83d7-d1f83239d490}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\scaler">
+      <UniqueIdentifier>{8cc14084-f5b9-4166-81ac-3f66afd6527d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="compat\rxml">
+      <UniqueIdentifier>{c2ea7f2b-5a09-4f28-8bbe-a628bd3a0bdd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="input\autoconf">
+      <UniqueIdentifier>{a923ed53-ddfb-47d1-a5e7-ec6105c4bd79}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps">
+      <UniqueIdentifier>{d1a36d53-e5e6-46a5-b5b4-b43794342cd1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps\zlib">
+      <UniqueIdentifier>{cf7c2fb9-ca3c-468e-af4f-74c652b3e5fe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\menu\backend">
+      <UniqueIdentifier>{dd1ca879-56f4-43f6-8bd8-ae50222061e8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="frontend\platform">
+      <UniqueIdentifier>{09d78055-1c93-4f12-ae3e-97aaa90cf78f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gfx\image">
+      <UniqueIdentifier>{4a5338d9-92ad-4d07-bb1a-97bd6eb475e4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="record">
+      <UniqueIdentifier>{5a80dd03-b4d7-4118-92ff-55a601fd80fc}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
\ No newline at end of file