From: Twinaphex <libretro@gmail.com>
Date: Mon, 17 Mar 2014 17:15:55 +0000 (+0100)
Subject: (MSVC) Compatibility fixes
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed06ffd3391ff81fa1f34455f1311ba060a41cac;p=picodrive.git

(MSVC) Compatibility fixes
---

diff --git a/cpu/drc/cmn.c b/cpu/drc/cmn.c
index 37f17ce..a07dcbd 100644
--- a/cpu/drc/cmn.c
+++ b/cpu/drc/cmn.c
@@ -10,7 +10,11 @@
 #include <pico/pico_int.h>
 #include "cmn.h"
 
+#ifdef _MSC_VER
+u8 tcache[DRC_TCACHE_SIZE];
+#else
 u8 __attribute__((aligned(4096))) tcache[DRC_TCACHE_SIZE];
+#endif
 
 
 void drc_cmn_init(void)
diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index ddb95ec..14d1c84 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -294,9 +294,9 @@ typedef void (event_cb)(unsigned int now);
 unsigned int p32x_event_times[P32X_EVENT_COUNT];
 static unsigned int event_time_next;
 static event_cb *p32x_event_cbs[P32X_EVENT_COUNT] = {
-  [P32X_EVENT_PWM]      = p32x_pwm_irq_event,
-  [P32X_EVENT_FILLEND]  = fillend_event,
-  [P32X_EVENT_HINT]     = hint_event,
+  p32x_pwm_irq_event,
+  fillend_event,
+  hint_event,
 };
 
 // schedule event at some time 'after', in m68k clocks
diff --git a/pico/32x/draw.c b/pico/32x/draw.c
index 66f67a7..ff07ef2 100644
--- a/pico/32x/draw.c
+++ b/pico/32x/draw.c
@@ -292,7 +292,7 @@ void PicoDraw32xLayerMdOnly(int offs, int lines)
   for (l = 0; l < lines; l++) {
     if (have_scan) {
       PicoScan32xBegin(l + offs);
-      dst = DrawLineDest + poffs;
+      dst = (unsigned short*)DrawLineDest + poffs;
     }
     for (p = 0; p < plen; p += 4) {
       dst[p + 0] = pal[*pmd++];
diff --git a/pico/cd/mcd.c b/pico/cd/mcd.c
index 687dfc3..73502b2 100644
--- a/pico/cd/mcd.c
+++ b/pico/cd/mcd.c
@@ -30,9 +30,10 @@ PICO_INTERNAL void PicoExitMCD(void)
 
 PICO_INTERNAL void PicoPowerMCD(void)
 {
+  int fmt_size;
   SekCycleCntS68k = SekCycleAimS68k = 0;
 
-  int fmt_size = sizeof(formatted_bram);
+  fmt_size = sizeof(formatted_bram);
   memset(Pico_mcd->prg_ram,    0, sizeof(Pico_mcd->prg_ram));
   memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
   memset(Pico_mcd->pcm_ram,    0, sizeof(Pico_mcd->pcm_ram));
@@ -200,10 +201,10 @@ typedef void (event_cb)(unsigned int now);
 unsigned int pcd_event_times[PCD_EVENT_COUNT];
 static unsigned int event_time_next;
 static event_cb *pcd_event_cbs[PCD_EVENT_COUNT] = {
-  [PCD_EVENT_CDC]      = pcd_cdc_event,
-  [PCD_EVENT_TIMER3]   = pcd_int3_timer_event,
-  [PCD_EVENT_GFX]      = gfx_update,
-  [PCD_EVENT_DMA]      = pcd_dma_event,
+  pcd_cdc_event,
+  pcd_int3_timer_event,
+  gfx_update,
+  pcd_dma_event,
 };
 
 void pcd_event_schedule(unsigned int now, enum pcd_event event, int after)
diff --git a/pico/draw.c b/pico/draw.c
index a03d887..dbd6363 100644
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -1568,7 +1568,7 @@ void PicoDrawSetOutBuf(void *dest, int increment)
 {
   DrawLineDestBase = dest;
   DrawLineDestIncrement = increment;
-  DrawLineDest = DrawLineDestBase + DrawScanline * increment;
+  DrawLineDest = (unsigned char*)DrawLineDestBase + DrawScanline * increment;
 }
 
 void PicoDrawSetInternalBuf(void *dest, int increment)
diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index 7b35c87..662254e 100644
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -42,7 +42,11 @@ static retro_audio_sample_batch_t audio_batch_cb;
 static void *vout_buf;
 static int vout_width, vout_height, vout_offset;
 
+#ifdef _MSC_VER
+static short sndBuffer[2*44100/50];
+#else
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
+#endif
 
 static void snd_write(int len);
 
@@ -109,6 +113,11 @@ void cache_flush_d_inval_i(void *start, void *end)
 
 static void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
 {
+	uint32_t flProtect, dwDesiredAccess;
+	off_t end;
+	HANDLE mmap_fd, h;
+	void *ret;
+
 	if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC))
 		return MAP_FAILED;
 	if (fd == -1) {
@@ -117,7 +126,6 @@ static void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t
 	} else if (flags & MAP_ANON)
 		return MAP_FAILED;
 
-	DWORD flProtect;
 	if (prot & PROT_WRITE) {
 		if (prot & PROT_EXEC)
 			flProtect = PAGE_EXECUTE_READWRITE;
@@ -131,8 +139,8 @@ static void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t
 	} else
 		flProtect = PAGE_READONLY;
 
-	off_t end = length + offset;
-	HANDLE mmap_fd, h;
+	end = length + offset;
+
 	if (fd == -1)
 		mmap_fd = INVALID_HANDLE_VALUE;
 	else
@@ -141,7 +149,6 @@ static void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t
 	if (h == NULL)
 		return MAP_FAILED;
 
-	DWORD dwDesiredAccess;
 	if (prot & PROT_WRITE)
 		dwDesiredAccess = FILE_MAP_WRITE;
 	else
@@ -150,7 +157,7 @@ static void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t
 		dwDesiredAccess |= FILE_MAP_EXECUTE;
 	if (flags & MAP_PRIVATE)
 		dwDesiredAccess |= FILE_MAP_COPY;
-	void *ret = MapViewOfFile(h, dwDesiredAccess, DWORD_HI(offset), DWORD_LO(offset), length);
+	ret = MapViewOfFile(h, dwDesiredAccess, DWORD_HI(offset), DWORD_LO(offset), length);
 	if (ret == NULL) {
 		CloseHandle(h);
 		ret = MAP_FAILED;
@@ -582,13 +589,13 @@ static bool disk_add_image_index(void)
 }
 
 static struct retro_disk_control_callback disk_control = {
-	.set_eject_state = disk_set_eject_state,
-	.get_eject_state = disk_get_eject_state,
-	.get_image_index = disk_get_image_index,
-	.set_image_index = disk_set_image_index,
-	.get_num_images = disk_get_num_images,
-	.replace_image_index = disk_replace_image_index,
-	.add_image_index = disk_add_image_index,
+	disk_set_eject_state,
+	disk_get_eject_state,
+	disk_get_image_index,
+	disk_set_image_index,
+	disk_get_num_images,
+	disk_replace_image_index,
+	disk_add_image_index,
 };
 
 static void disk_tray_open(void)
@@ -792,18 +799,18 @@ void retro_reset(void)
 }
 
 static const unsigned short retro_pico_map[] = {
-	[RETRO_DEVICE_ID_JOYPAD_B]	= 1 << GBTN_B,
-	[RETRO_DEVICE_ID_JOYPAD_Y]	= 1 << GBTN_A,
-	[RETRO_DEVICE_ID_JOYPAD_SELECT]	= 1 << GBTN_MODE,
-	[RETRO_DEVICE_ID_JOYPAD_START]	= 1 << GBTN_START,
-	[RETRO_DEVICE_ID_JOYPAD_UP]	= 1 << GBTN_UP,
-	[RETRO_DEVICE_ID_JOYPAD_DOWN]	= 1 << GBTN_DOWN,
-	[RETRO_DEVICE_ID_JOYPAD_LEFT]	= 1 << GBTN_LEFT,
-	[RETRO_DEVICE_ID_JOYPAD_RIGHT]	= 1 << GBTN_RIGHT,
-	[RETRO_DEVICE_ID_JOYPAD_A]	= 1 << GBTN_C,
-	[RETRO_DEVICE_ID_JOYPAD_X]	= 1 << GBTN_Y,
-	[RETRO_DEVICE_ID_JOYPAD_L]	= 1 << GBTN_X,
-	[RETRO_DEVICE_ID_JOYPAD_R]	= 1 << GBTN_Z,
+	1 << GBTN_B,
+	1 << GBTN_A,
+	1 << GBTN_MODE,
+	1 << GBTN_START,
+	1 << GBTN_UP,
+	1 << GBTN_DOWN,
+	1 << GBTN_LEFT,
+	1 << GBTN_RIGHT,
+	1 << GBTN_C,
+	1 << GBTN_Y,
+	1 << GBTN_X,
+	1 << GBTN_Z,
 };
 #define RETRO_PICO_MAP_LEN (sizeof(retro_pico_map) / sizeof(retro_pico_map[0]))
 
diff --git a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj
index 81e23ae..8d3ac9c 100644
--- a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj
@@ -49,7 +49,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;%(PreprocessorDefinitions);INLINE=_inline;_CRT_SECURE_NO_WARNINGS;EMU_F68K;_USE_CZ80;NO_ZLIB</PreprocessorDefinitions>
       <CompileAs>CompileAsC</CompileAs>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\..\;$(SolutionDIr)\..\..\..\pico;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -66,7 +66,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;%(PreprocessorDefinitions);INLINE=_inline;_CRT_SECURE_NO_WARNINGS;EMU_F68K;_USE_CZ80;NO_ZLIB</PreprocessorDefinitions>
       <CompileAs>CompileAsC</CompileAs>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\..\;$(SolutionDIr)\..\..\..\pico;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -78,6 +78,70 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\cpu\cz80\cz80.c" />
+    <ClCompile Include="..\..\..\..\cpu\drc\cmn.c" />
+    <ClCompile Include="..\..\..\..\cpu\fame\famec.c" />
+    <ClCompile Include="..\..\..\..\cpu\sh2\mame\sh2pico.c" />
+    <ClCompile Include="..\..\..\..\cpu\sh2\sh2.c" />
+    <ClCompile Include="..\..\..\..\pico\32x\32x.c" />
+    <ClCompile Include="..\..\..\..\pico\32x\draw.c" />
+    <ClCompile Include="..\..\..\..\pico\32x\memory.c" />
+    <ClCompile Include="..\..\..\..\pico\32x\pwm.c" />
+    <ClCompile Include="..\..\..\..\pico\32x\sh2soc.c" />
+    <ClCompile Include="..\..\..\..\pico\cart.c" />
+    <ClCompile Include="..\..\..\..\pico\carthw\carthw.c" />
+    <ClCompile Include="..\..\..\..\pico\carthw\svp\memory.c" />
+    <ClCompile Include="..\..\..\..\pico\carthw\svp\ssp16.c" />
+    <ClCompile Include="..\..\..\..\pico\carthw\svp\svp.c" />
+    <ClCompile Include="..\..\..\..\pico\carthw_cfg.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\cdc.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\cdd.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\cd_image.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\cell_map.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\cue.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\gfx.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\gfx_dma.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\mcd.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\memory.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\misc.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\pcm.c" />
+    <ClCompile Include="..\..\..\..\pico\cd\sek.c" />
+    <ClCompile Include="..\..\..\..\pico\debug.c" />
+    <ClCompile Include="..\..\..\..\pico\draw.c" />
+    <ClCompile Include="..\..\..\..\pico\draw2.c" />
+    <ClCompile Include="..\..\..\..\pico\eeprom.c" />
+    <ClCompile Include="..\..\..\..\pico\media.c" />
+    <ClCompile Include="..\..\..\..\pico\memory.c" />
+    <ClCompile Include="..\..\..\..\pico\misc.c" />
+    <ClCompile Include="..\..\..\..\pico\mode4.c" />
+    <ClCompile Include="..\..\..\..\pico\patch.c" />
+    <ClCompile Include="..\..\..\..\pico\pico.c" />
+    <ClCompile Include="..\..\..\..\pico\sek.c" />
+    <ClCompile Include="..\..\..\..\pico\sms.c" />
+    <ClCompile Include="..\..\..\..\pico\sound\mix.c" />
+    <ClCompile Include="..\..\..\..\pico\sound\sn76496.c" />
+    <ClCompile Include="..\..\..\..\pico\sound\sound.c" />
+    <ClCompile Include="..\..\..\..\pico\sound\ym2612.c" />
+    <ClCompile Include="..\..\..\..\pico\state.c" />
+    <ClCompile Include="..\..\..\..\pico\videoport.c" />
+    <ClCompile Include="..\..\..\..\pico\z80if.c" />
+    <ClCompile Include="..\..\..\..\unzip\unzip.c" />
+    <ClCompile Include="..\..\..\..\unzip\unzip_stream.c" />
+    <ClCompile Include="..\..\..\..\zlib\adler32.c" />
+    <ClCompile Include="..\..\..\..\zlib\compress.c" />
+    <ClCompile Include="..\..\..\..\zlib\crc32.c" />
+    <ClCompile Include="..\..\..\..\zlib\deflate.c" />
+    <ClCompile Include="..\..\..\..\zlib\example.c" />
+    <ClCompile Include="..\..\..\..\zlib\gzio.c" />
+    <ClCompile Include="..\..\..\..\zlib\infback.c" />
+    <ClCompile Include="..\..\..\..\zlib\inffast.c" />
+    <ClCompile Include="..\..\..\..\zlib\inflate.c" />
+    <ClCompile Include="..\..\..\..\zlib\inftrees.c" />
+    <ClCompile Include="..\..\..\..\zlib\trees.c" />
+    <ClCompile Include="..\..\..\..\zlib\uncompr.c" />
+    <ClCompile Include="..\..\..\..\zlib\zutil.c" />
+    <ClCompile Include="..\..\..\common\mp3.c" />
+    <ClCompile Include="..\..\..\common\mp3_dummy.c" />
     <ClCompile Include="..\..\libretro.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
index 851d90e..e4a0ccf 100644
--- a/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/platform/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
@@ -19,10 +19,247 @@
     <Filter Include="Source Files\platform\libretro">
       <UniqueIdentifier>{56e5d1cc-a749-46f0-9c75-e26037b4e2b3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\platform\common">
+      <UniqueIdentifier>{ab1e9796-fcf3-49c2-92f2-cbce4ad50f7f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\zlib">
+      <UniqueIdentifier>{d7cd40e2-d074-4967-84ad-89488a9eed11}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\unzip">
+      <UniqueIdentifier>{76c63342-13b7-413c-b44b-52ef07b4dccc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pico">
+      <UniqueIdentifier>{04bd626c-6833-49c7-8256-dc94935efe03}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pico\cd">
+      <UniqueIdentifier>{3b94bd08-c15d-46a4-9672-094f4cafbc06}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pico\32x">
+      <UniqueIdentifier>{403b507e-7278-436e-b8a5-5a0deb70dfae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pico\carthw">
+      <UniqueIdentifier>{27323686-5607-4502-9488-ac65c90e6969}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pico\carthw\svp">
+      <UniqueIdentifier>{2e0a2f96-c25d-473e-9456-5e25b6eb8036}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\pico\sound">
+      <UniqueIdentifier>{a208ee7f-75c1-4ff9-9ed5-ea2d42832fc6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cpu">
+      <UniqueIdentifier>{04862576-b191-4769-a0f8-bb6400cfa861}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cpu\famec">
+      <UniqueIdentifier>{337acc4a-3fe4-4547-b655-058d31318ffc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cpu\cz80">
+      <UniqueIdentifier>{63c3bec2-54b1-4831-a420-5e1aa120738b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cpu\drc">
+      <UniqueIdentifier>{85be1810-42b8-4ec7-bbd5-6c7d1dc5b763}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cpu\sh2">
+      <UniqueIdentifier>{055bac11-1f11-4fe7-be7b-09ebaeab74d5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cpu\sh2\mame">
+      <UniqueIdentifier>{dd1911b8-6d08-42aa-ab21-0ba1154613e1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libretro.c">
       <Filter>Source Files\platform\libretro</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\common\mp3.c">
+      <Filter>Source Files\platform\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\mp3_dummy.c">
+      <Filter>Source Files\platform\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\adler32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\compress.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\crc32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\deflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\example.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\gzio.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\infback.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\inffast.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\inflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\inftrees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\trees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\uncompr.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\zlib\zutil.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\unzip\unzip.c">
+      <Filter>Source Files\unzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\unzip\unzip_stream.c">
+      <Filter>Source Files\unzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cart.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\carthw_cfg.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\debug.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\draw.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\draw2.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\eeprom.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\media.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\memory.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\misc.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\mode4.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\patch.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\pico.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\sek.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\sms.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\state.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\videoport.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\z80if.c">
+      <Filter>Source Files\pico</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\cd_image.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\cdc.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\cdd.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\cell_map.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\cue.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\gfx.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\gfx_dma.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\mcd.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\memory.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\misc.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\pcm.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\cd\sek.c">
+      <Filter>Source Files\pico\cd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\32x\32x.c">
+      <Filter>Source Files\pico\32x</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\32x\draw.c">
+      <Filter>Source Files\pico\32x</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\32x\memory.c">
+      <Filter>Source Files\pico\32x</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\32x\pwm.c">
+      <Filter>Source Files\pico\32x</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\32x\sh2soc.c">
+      <Filter>Source Files\pico\32x</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\carthw\carthw.c">
+      <Filter>Source Files\pico\carthw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\carthw\svp\memory.c">
+      <Filter>Source Files\pico\carthw\svp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\carthw\svp\ssp16.c">
+      <Filter>Source Files\pico\carthw\svp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\carthw\svp\svp.c">
+      <Filter>Source Files\pico\carthw\svp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\sound\mix.c">
+      <Filter>Source Files\pico\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\sound\sn76496.c">
+      <Filter>Source Files\pico\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\sound\sound.c">
+      <Filter>Source Files\pico\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\pico\sound\ym2612.c">
+      <Filter>Source Files\pico\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\cpu\fame\famec.c">
+      <Filter>Source Files\cpu\famec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\cpu\cz80\cz80.c">
+      <Filter>Source Files\cpu\cz80</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\cpu\drc\cmn.c">
+      <Filter>Source Files\cpu\drc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\cpu\sh2\sh2.c">
+      <Filter>Source Files\cpu\sh2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\cpu\sh2\mame\sh2pico.c">
+      <Filter>Source Files\cpu\sh2\mame</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file