Fix WIN32/WINRT builds

win32/sdlpal.vcxproj

@@ -97,7 +97,7 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.\;..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>PAL_HAS_PLATFORM_SPECIFIC_UTILS;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -126,7 +126,7 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.\;..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>PAL_HAS_PLATFORM_SPECIFIC_UTILS;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -155,7 +155,7 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.\;..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>PAL_HAS_PLATFORM_SPECIFIC_UTILS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.\;..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>PAL_HAS_PLATFORM_SPECIFIC_UTILS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -206,9 +206,9 @@
     <Bscmake />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\adplug\adlibemu.c" />
-    <ClCompile Include="..\adplug\dbemuopl.cpp" />
-    <ClCompile Include="..\adplug\dbopl.cpp">
+    <ClCompile Include="..\src\adplug\adlibemu.c" />
+    <ClCompile Include="..\src\adplug\dbemuopl.cpp" />
+    <ClCompile Include="..\src\adplug\dbopl.cpp">
       <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AnySuitable</InlineFunctionExpansion>
       <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IntrinsicFunctions>
@@ -218,213 +218,213 @@
       <OmitFramePointers Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</OmitFramePointers>
       <OmitFramePointers Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</OmitFramePointers>
     </ClCompile>
-    <ClCompile Include="..\adplug\demuopl.cpp" />
-    <ClCompile Include="..\audio.c" />
-    <ClCompile Include="..\battle.c" />
-    <ClCompile Include="..\ending.c" />
-    <ClCompile Include="..\fight.c" />
-    <ClCompile Include="..\font.c" />
-    <ClCompile Include="..\game.c" />
-    <ClCompile Include="..\global.c" />
-    <ClCompile Include="..\input.c" />
-    <ClCompile Include="..\itemmenu.c" />
-    <ClCompile Include="..\liboggvorbis\src\analysis.c" />
-    <ClCompile Include="..\liboggvorbis\src\bitrate.c" />
-    <ClCompile Include="..\liboggvorbis\src\bitwise.c" />
-    <ClCompile Include="..\liboggvorbis\src\block.c" />
-    <ClCompile Include="..\liboggvorbis\src\codebook.c" />
-    <ClCompile Include="..\liboggvorbis\src\envelope.c" />
-    <ClCompile Include="..\liboggvorbis\src\floor0.c" />
-    <ClCompile Include="..\liboggvorbis\src\floor1.c" />
-    <ClCompile Include="..\liboggvorbis\src\framing.c" />
-    <ClCompile Include="..\liboggvorbis\src\info.c" />
-    <ClCompile Include="..\liboggvorbis\src\lookup.c" />
-    <ClCompile Include="..\liboggvorbis\src\lpc.c" />
-    <ClCompile Include="..\liboggvorbis\src\lsp.c" />
-    <ClCompile Include="..\liboggvorbis\src\mapping0.c" />
-    <ClCompile Include="..\liboggvorbis\src\mdct.c" />
-    <ClCompile Include="..\liboggvorbis\src\psy.c" />
-    <ClCompile Include="..\liboggvorbis\src\registry.c" />
-    <ClCompile Include="..\liboggvorbis\src\res0.c" />
-    <ClCompile Include="..\liboggvorbis\src\sharedbook.c" />
-    <ClCompile Include="..\liboggvorbis\src\smallft.c" />
-    <ClCompile Include="..\liboggvorbis\src\synthesis.c" />
-    <ClCompile Include="..\liboggvorbis\src\vorbisenc.c" />
-    <ClCompile Include="..\liboggvorbis\src\vorbisfile.c" />
-    <ClCompile Include="..\liboggvorbis\src\window.c" />
-    <ClCompile Include="..\magicmenu.c" />
-    <ClCompile Include="..\main.c" />
-    <ClCompile Include="..\map.c" />
-    <ClCompile Include="..\midi.c" />
-    <ClCompile Include="..\mp3play.c" />
-    <ClCompile Include="..\oggplay.c" />
-    <ClCompile Include="..\overlay.c" />
-    <ClCompile Include="..\palcfg.c" />
-    <ClCompile Include="..\palcommon.c" />
-    <ClCompile Include="..\palette.c" />
-    <ClCompile Include="..\play.c" />
-    <ClCompile Include="..\res.c" />
-    <ClCompile Include="..\resampler.c" />
-    <ClCompile Include="..\rixplay.cpp" />
-    <ClCompile Include="..\rngplay.c" />
-    <ClCompile Include="..\scene.c" />
-    <ClCompile Include="..\script.c" />
-    <ClCompile Include="..\sound.c" />
-    <ClCompile Include="..\text.c" />
-    <ClCompile Include="..\ui.c" />
-    <ClCompile Include="..\uibattle.c" />
-    <ClCompile Include="..\uigame.c" />
-    <ClCompile Include="..\util.c" />
-    <ClCompile Include="..\video.c" />
-    <ClCompile Include="..\yj1.c" />
-    <ClCompile Include="..\adplug\binfile.cpp" />
-    <ClCompile Include="..\adplug\binio.cpp" />
-    <ClCompile Include="..\adplug\dosbox_opl.cpp" />
-    <ClCompile Include="..\adplug\emuopl.cpp" />
-    <ClCompile Include="..\adplug\fmopl.c" />
-    <ClCompile Include="..\adplug\fprovide.cpp" />
-    <ClCompile Include="..\adplug\player.cpp" />
-    <ClCompile Include="..\adplug\rix.cpp" />
-    <ClCompile Include="..\adplug\surroundopl.cpp" />
-    <ClCompile Include="..\native_midi\native_midi_common.c" />
-    <ClCompile Include="..\native_midi\native_midi_win32.c" />
-    <ClCompile Include="..\libmad\bit.c" />
-    <ClCompile Include="..\libmad\decoder.c" />
-    <ClCompile Include="..\libmad\fixed.c" />
-    <ClCompile Include="..\libmad\frame.c" />
-    <ClCompile Include="..\libmad\huffman.c" />
-    <ClCompile Include="..\libmad\layer12.c" />
-    <ClCompile Include="..\libmad\layer3.c" />
-    <ClCompile Include="..\libmad\music_mad.c" />
-    <ClCompile Include="..\libmad\stream.c" />
-    <ClCompile Include="..\libmad\synth.c" />
-    <ClCompile Include="..\libmad\timer.c" />
+    <ClCompile Include="..\src\adplug\demuopl.cpp" />
+    <ClCompile Include="..\src\audio.c" />
+    <ClCompile Include="..\src\battle.c" />
+    <ClCompile Include="..\src\ending.c" />
+    <ClCompile Include="..\src\fight.c" />
+    <ClCompile Include="..\src\font.c" />
+    <ClCompile Include="..\src\game.c" />
+    <ClCompile Include="..\src\global.c" />
+    <ClCompile Include="..\src\input.c" />
+    <ClCompile Include="..\src\itemmenu.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\analysis.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\bitrate.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\bitwise.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\block.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\codebook.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\envelope.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\floor0.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\floor1.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\framing.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\info.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\lookup.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\lpc.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\lsp.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\mapping0.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\mdct.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\psy.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\registry.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\res0.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\sharedbook.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\smallft.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\synthesis.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\vorbisenc.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\vorbisfile.c" />
+    <ClCompile Include="..\src\liboggvorbis\src\window.c" />
+    <ClCompile Include="..\src\magicmenu.c" />
+    <ClCompile Include="..\src\main.c" />
+    <ClCompile Include="..\src\map.c" />
+    <ClCompile Include="..\src\midi.c" />
+    <ClCompile Include="..\src\mp3play.c" />
+    <ClCompile Include="..\src\oggplay.c" />
+    <ClCompile Include="..\src\overlay.c" />
+    <ClCompile Include="..\src\palcfg.c" />
+    <ClCompile Include="..\src\palcommon.c" />
+    <ClCompile Include="..\src\palette.c" />
+    <ClCompile Include="..\src\play.c" />
+    <ClCompile Include="..\src\res.c" />
+    <ClCompile Include="..\src\resampler.c" />
+    <ClCompile Include="..\src\rixplay.cpp" />
+    <ClCompile Include="..\src\rngplay.c" />
+    <ClCompile Include="..\src\scene.c" />
+    <ClCompile Include="..\src\script.c" />
+    <ClCompile Include="..\src\sound.c" />
+    <ClCompile Include="..\src\text.c" />
+    <ClCompile Include="..\src\ui.c" />
+    <ClCompile Include="..\src\uibattle.c" />
+    <ClCompile Include="..\src\uigame.c" />
+    <ClCompile Include="..\src\util.c" />
+    <ClCompile Include="..\src\video.c" />
+    <ClCompile Include="..\src\yj1.c" />
+    <ClCompile Include="..\src\adplug\binfile.cpp" />
+    <ClCompile Include="..\src\adplug\binio.cpp" />
+    <ClCompile Include="..\src\adplug\dosbox_opl.cpp" />
+    <ClCompile Include="..\src\adplug\emuopl.cpp" />
+    <ClCompile Include="..\src\adplug\fmopl.c" />
+    <ClCompile Include="..\src\adplug\fprovide.cpp" />
+    <ClCompile Include="..\src\adplug\player.cpp" />
+    <ClCompile Include="..\src\adplug\rix.cpp" />
+    <ClCompile Include="..\src\adplug\surroundopl.cpp" />
+    <ClCompile Include="..\src\native_midi\native_midi_common.c" />
+    <ClCompile Include="..\src\native_midi\native_midi_win32.c" />
+    <ClCompile Include="..\src\libmad\bit.c" />
+    <ClCompile Include="..\src\libmad\decoder.c" />
+    <ClCompile Include="..\src\libmad\fixed.c" />
+    <ClCompile Include="..\src\libmad\frame.c" />
+    <ClCompile Include="..\src\libmad\huffman.c" />
+    <ClCompile Include="..\src\libmad\layer12.c" />
+    <ClCompile Include="..\src\libmad\layer3.c" />
+    <ClCompile Include="..\src\libmad\music_mad.c" />
+    <ClCompile Include="..\src\libmad\stream.c" />
+    <ClCompile Include="..\src\libmad\synth.c" />
+    <ClCompile Include="..\src\libmad\timer.c" />
     <ClCompile Include="win32.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\adplug\adlibemu.h" />
-    <ClInclude Include="..\adplug\dbemuopl.h" />
-    <ClInclude Include="..\adplug\dbopl.h" />
-    <ClInclude Include="..\adplug\kemuopl.h" />
-    <ClInclude Include="..\ascii.h" />
-    <ClInclude Include="..\battle.h" />
-    <ClInclude Include="..\codepage.h" />
-    <ClInclude Include="..\common.h" />
-    <ClInclude Include="..\liboggvorbis\include\ogg\config_types.h" />
-    <ClInclude Include="..\ending.h" />
-    <ClInclude Include="..\fight.h" />
-    <ClInclude Include="..\font.h" />
-    <ClInclude Include="..\fontglyph.h" />
-    <ClInclude Include="..\game.h" />
-    <ClInclude Include="..\global.h" />
-    <ClInclude Include="..\input.h" />
-    <ClInclude Include="..\itemmenu.h" />
-    <ClInclude Include="..\liboggvorbis\include\ogg\ogg.h" />
-    <ClInclude Include="..\liboggvorbis\include\ogg\os_types.h" />
-    <ClInclude Include="..\liboggvorbis\include\vorbis\codec.h" />
-    <ClInclude Include="..\liboggvorbis\include\vorbis\vorbisenc.h" />
-    <ClInclude Include="..\liboggvorbis\include\vorbis\vorbisfile.h" />
-    <ClInclude Include="..\liboggvorbis\src\backends.h" />
-    <ClInclude Include="..\liboggvorbis\src\bitrate.h" />
-    <ClInclude Include="..\liboggvorbis\src\books\coupled\res_books_51.h" />
-    <ClInclude Include="..\liboggvorbis\src\books\coupled\res_books_stereo.h" />
-    <ClInclude Include="..\liboggvorbis\src\books\floor\floor_books.h" />
-    <ClInclude Include="..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
-    <ClInclude Include="..\liboggvorbis\src\codebook.h" />
-    <ClInclude Include="..\liboggvorbis\src\codec_internal.h" />
-    <ClInclude Include="..\liboggvorbis\src\envelope.h" />
-    <ClInclude Include="..\liboggvorbis\src\highlevel.h" />
-    <ClInclude Include="..\liboggvorbis\src\lookup.h" />
-    <ClInclude Include="..\liboggvorbis\src\lookup_data.h" />
-    <ClInclude Include="..\liboggvorbis\src\lpc.h" />
-    <ClInclude Include="..\liboggvorbis\src\lsp.h" />
-    <ClInclude Include="..\liboggvorbis\src\masking.h" />
-    <ClInclude Include="..\liboggvorbis\src\mdct.h" />
-    <ClInclude Include="..\liboggvorbis\src\misc.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\floor_all.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_11.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_16.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_44.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_8.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_16.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_44.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_44p51.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_44u.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_8.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_11.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_16.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_22.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_32.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_44.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_44p51.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_44u.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_8.h" />
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_X.h" />
-    <ClInclude Include="..\liboggvorbis\src\os.h" />
-    <ClInclude Include="..\liboggvorbis\src\psy.h" />
-    <ClInclude Include="..\liboggvorbis\src\registry.h" />
-    <ClInclude Include="..\liboggvorbis\src\scales.h" />
-    <ClInclude Include="..\liboggvorbis\src\smallft.h" />
-    <ClInclude Include="..\liboggvorbis\src\window.h" />
-    <ClInclude Include="..\magicmenu.h" />
-    <ClInclude Include="..\main.h" />
-    <ClInclude Include="..\map.h" />
-    <ClInclude Include="..\midi.h" />
-    <ClInclude Include="..\palcfg.h" />
-    <ClInclude Include="..\palcommon.h" />
-    <ClInclude Include="..\palette.h" />
-    <ClInclude Include="..\play.h" />
-    <ClInclude Include="..\res.h" />
-    <ClInclude Include="..\resampler.h" />
-    <ClInclude Include="..\players.h" />
-    <ClInclude Include="..\rngplay.h" />
-    <ClInclude Include="..\scene.h" />
-    <ClInclude Include="..\script.h" />
-    <ClInclude Include="..\audio.h" />
-    <ClInclude Include="..\text.h" />
-    <ClInclude Include="..\ui.h" />
-    <ClInclude Include="..\uibattle.h" />
-    <ClInclude Include="..\uigame.h" />
-    <ClInclude Include="..\util.h" />
-    <ClInclude Include="..\video.h" />
-    <ClInclude Include="..\adplug\binfile.h" />
-    <ClInclude Include="..\adplug\binio.h" />
-    <ClInclude Include="..\adplug\demuopl.h" />
-    <ClInclude Include="..\adplug\dosbox_opl.h" />
-    <ClInclude Include="..\adplug\emuopl.h" />
-    <ClInclude Include="..\adplug\fmopl.h" />
-    <ClInclude Include="..\adplug\fprovide.h" />
-    <ClInclude Include="..\adplug\opl.h" />
-    <ClInclude Include="..\adplug\player.h" />
-    <ClInclude Include="..\adplug\rix.h" />
-    <ClInclude Include="..\adplug\surroundopl.h" />
-    <ClInclude Include="..\native_midi\native_midi.h" />
-    <ClInclude Include="..\native_midi\native_midi_common.h" />
-    <ClInclude Include="..\libmad\bit.h" />
-    <ClInclude Include="..\libmad\decoder.h" />
-    <ClInclude Include="..\libmad\fixed.h" />
-    <ClInclude Include="..\libmad\frame.h" />
-    <ClInclude Include="..\libmad\huffman.h" />
-    <ClInclude Include="..\libmad\layer12.h" />
-    <ClInclude Include="..\libmad\layer3.h" />
-    <ClInclude Include="..\libmad\libmad_config.h" />
-    <ClInclude Include="..\libmad\libmad_global.h" />
-    <ClInclude Include="..\libmad\mad.h" />
-    <ClInclude Include="..\libmad\music_mad.h" />
-    <ClInclude Include="..\libmad\stream.h" />
-    <ClInclude Include="..\libmad\synth.h" />
-    <ClInclude Include="..\libmad\timer.h" />
+    <ClInclude Include="..\src\adplug\adlibemu.h" />
+    <ClInclude Include="..\src\adplug\dbemuopl.h" />
+    <ClInclude Include="..\src\adplug\dbopl.h" />
+    <ClInclude Include="..\src\adplug\kemuopl.h" />
+    <ClInclude Include="..\src\ascii.h" />
+    <ClInclude Include="..\src\battle.h" />
+    <ClInclude Include="..\src\codepage.h" />
+    <ClInclude Include="..\src\common.h" />
+    <ClInclude Include="..\src\liboggvorbis\include\ogg\config_types.h" />
+    <ClInclude Include="..\src\ending.h" />
+    <ClInclude Include="..\src\fight.h" />
+    <ClInclude Include="..\src\font.h" />
+    <ClInclude Include="..\src\fontglyph.h" />
+    <ClInclude Include="..\src\game.h" />
+    <ClInclude Include="..\src\global.h" />
+    <ClInclude Include="..\src\input.h" />
+    <ClInclude Include="..\src\itemmenu.h" />
+    <ClInclude Include="..\src\liboggvorbis\include\ogg\ogg.h" />
+    <ClInclude Include="..\src\liboggvorbis\include\ogg\os_types.h" />
+    <ClInclude Include="..\src\liboggvorbis\include\vorbis\codec.h" />
+    <ClInclude Include="..\src\liboggvorbis\include\vorbis\vorbisenc.h" />
+    <ClInclude Include="..\src\liboggvorbis\include\vorbis\vorbisfile.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\backends.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\bitrate.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\books\coupled\res_books_51.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\books\coupled\res_books_stereo.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\books\floor\floor_books.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\codebook.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\codec_internal.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\envelope.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\highlevel.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\lookup.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\lookup_data.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\lpc.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\lsp.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\masking.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\mdct.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\misc.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\floor_all.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_11.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_16.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_44.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_8.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_16.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_44.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_44p51.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_44u.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_8.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_11.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_16.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_22.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_32.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_44.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_44p51.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_44u.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_8.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_X.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\os.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\psy.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\registry.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\scales.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\smallft.h" />
+    <ClInclude Include="..\src\liboggvorbis\src\window.h" />
+    <ClInclude Include="..\src\magicmenu.h" />
+    <ClInclude Include="..\src\main.h" />
+    <ClInclude Include="..\src\map.h" />
+    <ClInclude Include="..\src\midi.h" />
+    <ClInclude Include="..\src\palcfg.h" />
+    <ClInclude Include="..\src\palcommon.h" />
+    <ClInclude Include="..\src\palette.h" />
+    <ClInclude Include="..\src\play.h" />
+    <ClInclude Include="..\src\res.h" />
+    <ClInclude Include="..\src\resampler.h" />
+    <ClInclude Include="..\src\players.h" />
+    <ClInclude Include="..\src\rngplay.h" />
+    <ClInclude Include="..\src\scene.h" />
+    <ClInclude Include="..\src\script.h" />
+    <ClInclude Include="..\src\audio.h" />
+    <ClInclude Include="..\src\text.h" />
+    <ClInclude Include="..\src\ui.h" />
+    <ClInclude Include="..\src\uibattle.h" />
+    <ClInclude Include="..\src\uigame.h" />
+    <ClInclude Include="..\src\util.h" />
+    <ClInclude Include="..\src\video.h" />
+    <ClInclude Include="..\src\adplug\binfile.h" />
+    <ClInclude Include="..\src\adplug\binio.h" />
+    <ClInclude Include="..\src\adplug\demuopl.h" />
+    <ClInclude Include="..\src\adplug\dosbox_opl.h" />
+    <ClInclude Include="..\src\adplug\emuopl.h" />
+    <ClInclude Include="..\src\adplug\fmopl.h" />
+    <ClInclude Include="..\src\adplug\fprovide.h" />
+    <ClInclude Include="..\src\adplug\opl.h" />
+    <ClInclude Include="..\src\adplug\player.h" />
+    <ClInclude Include="..\src\adplug\rix.h" />
+    <ClInclude Include="..\src\adplug\surroundopl.h" />
+    <ClInclude Include="..\src\native_midi\native_midi.h" />
+    <ClInclude Include="..\src\native_midi\native_midi_common.h" />
+    <ClInclude Include="..\src\libmad\bit.h" />
+    <ClInclude Include="..\src\libmad\decoder.h" />
+    <ClInclude Include="..\src\libmad\fixed.h" />
+    <ClInclude Include="..\src\libmad\frame.h" />
+    <ClInclude Include="..\src\libmad\huffman.h" />
+    <ClInclude Include="..\src\libmad\layer12.h" />
+    <ClInclude Include="..\src\libmad\layer3.h" />
+    <ClInclude Include="..\src\libmad\libmad_config.h" />
+    <ClInclude Include="..\src\libmad\libmad_global.h" />
+    <ClInclude Include="..\src\libmad\mad.h" />
+    <ClInclude Include="..\src\libmad\music_mad.h" />
+    <ClInclude Include="..\src\libmad\stream.h" />
+    <ClInclude Include="..\src\libmad\synth.h" />
+    <ClInclude Include="..\src\libmad\timer.h" />
     <ClInclude Include="pal_config.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\sdlpal.cfg.example" />
     <None Include="..\sdlpal.ico" />
-    <None Include="..\libmad\D.dat" />
-    <None Include="..\libmad\imdct_s.dat" />
-    <None Include="..\libmad\qc_table.dat" />
-    <None Include="..\libmad\rq_table.dat" />
-    <None Include="..\libmad\sf_table.dat" />
+    <None Include="..\src\libmad\D.dat" />
+    <None Include="..\src\libmad\imdct_s.dat" />
+    <None Include="..\src\libmad\qc_table.dat" />
+    <None Include="..\src\libmad\rq_table.dat" />
+    <None Include="..\src\libmad\sf_table.dat" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="sdlpal.rc" />

win32/sdlpal.vcxproj.filters

@@ -56,600 +56,600 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\battle.c">
+    <ClCompile Include="..\src\battle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ending.c">
+    <ClCompile Include="..\src\ending.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\fight.c">
+    <ClCompile Include="..\src\fight.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\font.c">
+    <ClCompile Include="..\src\font.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\game.c">
+    <ClCompile Include="..\src\game.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\global.c">
+    <ClCompile Include="..\src\global.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\input.c">
+    <ClCompile Include="..\src\input.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\itemmenu.c">
+    <ClCompile Include="..\src\itemmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\magicmenu.c">
+    <ClCompile Include="..\src\magicmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\main.c">
+    <ClCompile Include="..\src\main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\map.c">
+    <ClCompile Include="..\src\map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\midi.c">
+    <ClCompile Include="..\src\midi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\palcommon.c">
+    <ClCompile Include="..\src\palcommon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\palette.c">
+    <ClCompile Include="..\src\palette.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\play.c">
+    <ClCompile Include="..\src\play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\res.c">
+    <ClCompile Include="..\src\res.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\rixplay.cpp">
+    <ClCompile Include="..\src\rixplay.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\rngplay.c">
+    <ClCompile Include="..\src\rngplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\scene.c">
+    <ClCompile Include="..\src\scene.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\script.c">
+    <ClCompile Include="..\src\script.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\sound.c">
+    <ClCompile Include="..\src\sound.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\text.c">
+    <ClCompile Include="..\src\text.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ui.c">
+    <ClCompile Include="..\src\ui.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\uibattle.c">
+    <ClCompile Include="..\src\uibattle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\uigame.c">
+    <ClCompile Include="..\src\uigame.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\util.c">
+    <ClCompile Include="..\src\util.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\video.c">
+    <ClCompile Include="..\src\video.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\binfile.cpp">
+    <ClCompile Include="..\src\adplug\binfile.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\binio.cpp">
+    <ClCompile Include="..\src\adplug\binio.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\dosbox_opl.cpp">
+    <ClCompile Include="..\src\adplug\dosbox_opl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\emuopl.cpp">
+    <ClCompile Include="..\src\adplug\emuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\fmopl.c">
+    <ClCompile Include="..\src\adplug\fmopl.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\fprovide.cpp">
+    <ClCompile Include="..\src\adplug\fprovide.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\player.cpp">
+    <ClCompile Include="..\src\adplug\player.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\rix.cpp">
+    <ClCompile Include="..\src\adplug\rix.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\surroundopl.cpp">
+    <ClCompile Include="..\src\adplug\surroundopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\native_midi\native_midi_common.c">
+    <ClCompile Include="..\src\native_midi\native_midi_common.c">
       <Filter>native_midi</Filter>
     </ClCompile>
-    <ClCompile Include="..\native_midi\native_midi_win32.c">
+    <ClCompile Include="..\src\native_midi\native_midi_win32.c">
       <Filter>native_midi</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\bit.c">
+    <ClCompile Include="..\src\libmad\bit.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\decoder.c">
+    <ClCompile Include="..\src\libmad\decoder.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\fixed.c">
+    <ClCompile Include="..\src\libmad\fixed.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\frame.c">
+    <ClCompile Include="..\src\libmad\frame.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\huffman.c">
+    <ClCompile Include="..\src\libmad\huffman.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\layer12.c">
+    <ClCompile Include="..\src\libmad\layer12.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\layer3.c">
+    <ClCompile Include="..\src\libmad\layer3.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\music_mad.c">
+    <ClCompile Include="..\src\libmad\music_mad.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\stream.c">
+    <ClCompile Include="..\src\libmad\stream.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\synth.c">
+    <ClCompile Include="..\src\libmad\synth.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\libmad\timer.c">
+    <ClCompile Include="..\src\libmad\timer.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\resampler.c">
+    <ClCompile Include="..\src\resampler.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\adlibemu.c">
+    <ClCompile Include="..\src\adplug\adlibemu.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\demuopl.cpp">
+    <ClCompile Include="..\src\adplug\demuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\yj1.c">
+    <ClCompile Include="..\src\yj1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\analysis.c">
+    <ClCompile Include="..\src\liboggvorbis\src\analysis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\bitrate.c">
+    <ClCompile Include="..\src\liboggvorbis\src\bitrate.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\bitwise.c">
+    <ClCompile Include="..\src\liboggvorbis\src\bitwise.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\block.c">
+    <ClCompile Include="..\src\liboggvorbis\src\block.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\codebook.c">
+    <ClCompile Include="..\src\liboggvorbis\src\codebook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\envelope.c">
+    <ClCompile Include="..\src\liboggvorbis\src\envelope.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\floor0.c">
+    <ClCompile Include="..\src\liboggvorbis\src\floor0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\floor1.c">
+    <ClCompile Include="..\src\liboggvorbis\src\floor1.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\framing.c">
+    <ClCompile Include="..\src\liboggvorbis\src\framing.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\info.c">
+    <ClCompile Include="..\src\liboggvorbis\src\info.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\lookup.c">
+    <ClCompile Include="..\src\liboggvorbis\src\lookup.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\lpc.c">
+    <ClCompile Include="..\src\liboggvorbis\src\lpc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\lsp.c">
+    <ClCompile Include="..\src\liboggvorbis\src\lsp.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\mapping0.c">
+    <ClCompile Include="..\src\liboggvorbis\src\mapping0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\mdct.c">
+    <ClCompile Include="..\src\liboggvorbis\src\mdct.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\psy.c">
+    <ClCompile Include="..\src\liboggvorbis\src\psy.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\registry.c">
+    <ClCompile Include="..\src\liboggvorbis\src\registry.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\res0.c">
+    <ClCompile Include="..\src\liboggvorbis\src\res0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\sharedbook.c">
+    <ClCompile Include="..\src\liboggvorbis\src\sharedbook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\smallft.c">
+    <ClCompile Include="..\src\liboggvorbis\src\smallft.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\synthesis.c">
+    <ClCompile Include="..\src\liboggvorbis\src\synthesis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\vorbisenc.c">
+    <ClCompile Include="..\src\liboggvorbis\src\vorbisenc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\vorbisfile.c">
+    <ClCompile Include="..\src\liboggvorbis\src\vorbisfile.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\liboggvorbis\src\window.c">
+    <ClCompile Include="..\src\liboggvorbis\src\window.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\oggplay.c">
+    <ClCompile Include="..\src\oggplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\mp3play.c">
+    <ClCompile Include="..\src\mp3play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\dbopl.cpp">
+    <ClCompile Include="..\src\adplug\dbopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\adplug\dbemuopl.cpp">
+    <ClCompile Include="..\src\adplug\dbemuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
     <ClCompile Include="win32.cpp">
       <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\overlay.c">
+    <ClCompile Include="..\src\overlay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\palcfg.c">
+    <ClCompile Include="..\src\palcfg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\audio.c">
+    <ClCompile Include="..\src\audio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\ascii.h">
+    <ClInclude Include="..\src\ascii.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\battle.h">
+    <ClInclude Include="..\src\battle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common.h">
+    <ClInclude Include="..\src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ending.h">
+    <ClInclude Include="..\src\ending.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\fight.h">
+    <ClInclude Include="..\src\fight.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\font.h">
+    <ClInclude Include="..\src\font.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\game.h">
+    <ClInclude Include="..\src\game.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\global.h">
+    <ClInclude Include="..\src\global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\input.h">
+    <ClInclude Include="..\src\input.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\itemmenu.h">
+    <ClInclude Include="..\src\itemmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\magicmenu.h">
+    <ClInclude Include="..\src\magicmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\main.h">
+    <ClInclude Include="..\src\main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\map.h">
+    <ClInclude Include="..\src\map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\midi.h">
+    <ClInclude Include="..\src\midi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\palcommon.h">
+    <ClInclude Include="..\src\palcommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\palette.h">
+    <ClInclude Include="..\src\palette.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\play.h">
+    <ClInclude Include="..\src\play.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\res.h">
+    <ClInclude Include="..\src\res.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\rngplay.h">
+    <ClInclude Include="..\src\rngplay.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\scene.h">
+    <ClInclude Include="..\src\scene.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\script.h">
+    <ClInclude Include="..\src\script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\text.h">
+    <ClInclude Include="..\src\text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ui.h">
+    <ClInclude Include="..\src\ui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\uibattle.h">
+    <ClInclude Include="..\src\uibattle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\uigame.h">
+    <ClInclude Include="..\src\uigame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\util.h">
+    <ClInclude Include="..\src\util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\video.h">
+    <ClInclude Include="..\src\video.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\binfile.h">
+    <ClInclude Include="..\src\adplug\binfile.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\binio.h">
+    <ClInclude Include="..\src\adplug\binio.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\demuopl.h">
+    <ClInclude Include="..\src\adplug\demuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\dosbox_opl.h">
+    <ClInclude Include="..\src\adplug\dosbox_opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\emuopl.h">
+    <ClInclude Include="..\src\adplug\emuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\fmopl.h">
+    <ClInclude Include="..\src\adplug\fmopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\fprovide.h">
+    <ClInclude Include="..\src\adplug\fprovide.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\opl.h">
+    <ClInclude Include="..\src\adplug\opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\player.h">
+    <ClInclude Include="..\src\adplug\player.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\rix.h">
+    <ClInclude Include="..\src\adplug\rix.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\surroundopl.h">
+    <ClInclude Include="..\src\adplug\surroundopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\native_midi\native_midi.h">
+    <ClInclude Include="..\src\native_midi\native_midi.h">
       <Filter>native_midi</Filter>
     </ClInclude>
-    <ClInclude Include="..\native_midi\native_midi_common.h">
+    <ClInclude Include="..\src\native_midi\native_midi_common.h">
       <Filter>native_midi</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\bit.h">
+    <ClInclude Include="..\src\libmad\bit.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\decoder.h">
+    <ClInclude Include="..\src\libmad\decoder.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\fixed.h">
+    <ClInclude Include="..\src\libmad\fixed.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\frame.h">
+    <ClInclude Include="..\src\libmad\frame.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\huffman.h">
+    <ClInclude Include="..\src\libmad\huffman.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\layer12.h">
+    <ClInclude Include="..\src\libmad\layer12.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\layer3.h">
+    <ClInclude Include="..\src\libmad\layer3.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\libmad_config.h">
+    <ClInclude Include="..\src\libmad\libmad_config.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\libmad_global.h">
+    <ClInclude Include="..\src\libmad\libmad_global.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\mad.h">
+    <ClInclude Include="..\src\libmad\mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\music_mad.h">
+    <ClInclude Include="..\src\libmad\music_mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\stream.h">
+    <ClInclude Include="..\src\libmad\stream.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\synth.h">
+    <ClInclude Include="..\src\libmad\synth.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\libmad\timer.h">
+    <ClInclude Include="..\src\libmad\timer.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\codepage.h">
+    <ClInclude Include="..\src\codepage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\fontglyph.h">
+    <ClInclude Include="..\src\fontglyph.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\resampler.h">
+    <ClInclude Include="..\src\resampler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\adlibemu.h">
+    <ClInclude Include="..\src\adplug\adlibemu.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\kemuopl.h">
+    <ClInclude Include="..\src\adplug\kemuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\floor_all.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\floor_all.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_8.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_11.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_16.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\psych_44.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\psych_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_8.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_16.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_44.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_44p51.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\residue_44u.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\residue_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_8.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_11.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_16.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_22.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_22.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_32.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_32.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_44.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_44p51.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_44u.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\modes\setup_X.h">
+    <ClInclude Include="..\src\liboggvorbis\src\modes\setup_X.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\books\coupled\res_books_51.h">
+    <ClInclude Include="..\src\liboggvorbis\src\books\coupled\res_books_51.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\books\coupled\res_books_stereo.h">
+    <ClInclude Include="..\src\liboggvorbis\src\books\coupled\res_books_stereo.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\books\floor\floor_books.h">
+    <ClInclude Include="..\src\liboggvorbis\src\books\floor\floor_books.h">
       <Filter>liboggvorbis\src\books\floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
+    <ClInclude Include="..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
       <Filter>liboggvorbis\src\books\uncoupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\backends.h">
+    <ClInclude Include="..\src\liboggvorbis\src\backends.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\bitrate.h">
+    <ClInclude Include="..\src\liboggvorbis\src\bitrate.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\codebook.h">
+    <ClInclude Include="..\src\liboggvorbis\src\codebook.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\codec_internal.h">
+    <ClInclude Include="..\src\liboggvorbis\src\codec_internal.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\envelope.h">
+    <ClInclude Include="..\src\liboggvorbis\src\envelope.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\highlevel.h">
+    <ClInclude Include="..\src\liboggvorbis\src\highlevel.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\lookup.h">
+    <ClInclude Include="..\src\liboggvorbis\src\lookup.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\lookup_data.h">
+    <ClInclude Include="..\src\liboggvorbis\src\lookup_data.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\lpc.h">
+    <ClInclude Include="..\src\liboggvorbis\src\lpc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\lsp.h">
+    <ClInclude Include="..\src\liboggvorbis\src\lsp.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\masking.h">
+    <ClInclude Include="..\src\liboggvorbis\src\masking.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\mdct.h">
+    <ClInclude Include="..\src\liboggvorbis\src\mdct.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\misc.h">
+    <ClInclude Include="..\src\liboggvorbis\src\misc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\os.h">
+    <ClInclude Include="..\src\liboggvorbis\src\os.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\psy.h">
+    <ClInclude Include="..\src\liboggvorbis\src\psy.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\registry.h">
+    <ClInclude Include="..\src\liboggvorbis\src\registry.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\scales.h">
+    <ClInclude Include="..\src\liboggvorbis\src\scales.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\smallft.h">
+    <ClInclude Include="..\src\liboggvorbis\src\smallft.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\src\window.h">
+    <ClInclude Include="..\src\liboggvorbis\src\window.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\include\vorbis\codec.h">
+    <ClInclude Include="..\src\liboggvorbis\include\vorbis\codec.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\include\vorbis\vorbisenc.h">
+    <ClInclude Include="..\src\liboggvorbis\include\vorbis\vorbisenc.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\include\vorbis\vorbisfile.h">
+    <ClInclude Include="..\src\liboggvorbis\include\vorbis\vorbisfile.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\include\ogg\ogg.h">
+    <ClInclude Include="..\src\liboggvorbis\include\ogg\ogg.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\include\ogg\os_types.h">
+    <ClInclude Include="..\src\liboggvorbis\include\ogg\os_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\players.h">
+    <ClInclude Include="..\src\players.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\dbopl.h">
+    <ClInclude Include="..\src\adplug\dbopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\adplug\dbemuopl.h">
+    <ClInclude Include="..\src\adplug\dbemuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\liboggvorbis\include\ogg\config_types.h">
+    <ClInclude Include="..\src\liboggvorbis\include\ogg\config_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\palcfg.h">
+    <ClInclude Include="..\src\palcfg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\audio.h">
+    <ClInclude Include="..\src\audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="pal_config.h">
@@ -660,19 +660,19 @@
     <None Include="..\sdlpal.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\libmad\D.dat">
+    <None Include="..\src\libmad\D.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\imdct_s.dat">
+    <None Include="..\src\libmad\imdct_s.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\qc_table.dat">
+    <None Include="..\src\libmad\qc_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\rq_table.dat">
+    <None Include="..\src\libmad\rq_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\sf_table.dat">
+    <None Include="..\src\libmad\sf_table.dat">
       <Filter>libmad</Filter>
     </None>
     <None Include="..\sdlpal.cfg.example">

win32/win32.cpp

@@ -8,10 +8,10 @@
 #include <ShlObj.h>
 #include <string>
 #include "resource.h"
-#include "../global.h"
-#include "../util.h"
-#include "../palcfg.h"
-#include "../resampler.h"
+#include "../src/global.h"
+#include "../src/util.h"
+#include "../src/palcfg.h"
+#include "../src/resampler.h"
 
 #pragma comment(lib, "comctl32.lib")
 #pragma comment(linker,"\"/manifestdependency:type='win32' \

winrt/SDLPal.Common/MainPage.xaml.cpp

@@ -7,8 +7,8 @@
 #include "MainPage.xaml.h"
 #include "StringHelper.h"
 #include "AsyncHelper.h"
-#include "../../global.h"
-#include "../../palcfg.h"
+#include "../../src/global.h"
+#include "../../src/palcfg.h"
 
 using namespace SDLPal;
 

winrt/SDLPal.Common/SDLPal.cpp

@@ -3,8 +3,8 @@
 #include <wrl.h>
 #include <windows.h>
 #include "../SDLPal.Common/AsyncHelper.h"
-#include "../../global.h"
-#include "../../palcfg.h"
+#include "../../src/global.h"
+#include "../../src/palcfg.h"
 #include "App.xaml.h"
 
 HANDLE g_eventHandle = CreateEventEx(NULL, NULL, 0, EVENT_ALL_ACCESS);

winrt/SDLPal.Common/WinRTUtil.cpp

@@ -6,7 +6,7 @@
 #include <ppltasks.h>
 #include "../SDLPal.Common/AsyncHelper.h"
 #include "../SDLPal.Common/StringHelper.h"
-#include "../../main.h"
+#include "../../src/main.h"
 
 #include "SDL.h"
 #include "SDL_endian.h"

winrt/SDLPal.UWP/SDLPal.Core.vcxproj

@@ -132,7 +132,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -146,7 +146,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -160,7 +160,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -174,7 +174,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -188,7 +188,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -202,7 +202,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -215,205 +215,205 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\adplug\adlibemu.h" />
-    <ClInclude Include="..\..\adplug\binfile.h" />
-    <ClInclude Include="..\..\adplug\binio.h" />
-    <ClInclude Include="..\..\adplug\dbemuopl.h" />
-    <ClInclude Include="..\..\adplug\dbopl.h" />
-    <ClInclude Include="..\..\adplug\demuopl.h" />
-    <ClInclude Include="..\..\adplug\dosbox_opl.h" />
-    <ClInclude Include="..\..\adplug\emuopl.h" />
-    <ClInclude Include="..\..\adplug\fmopl.h" />
-    <ClInclude Include="..\..\adplug\fprovide.h" />
-    <ClInclude Include="..\..\adplug\opl.h" />
-    <ClInclude Include="..\..\adplug\player.h" />
-    <ClInclude Include="..\..\adplug\rix.h" />
-    <ClInclude Include="..\..\adplug\surroundopl.h" />
-    <ClInclude Include="..\..\ascii.h" />
-    <ClInclude Include="..\..\battle.h" />
-    <ClInclude Include="..\..\codepage.h" />
-    <ClInclude Include="..\..\common.h" />
-    <ClInclude Include="..\..\ending.h" />
-    <ClInclude Include="..\..\fight.h" />
-    <ClInclude Include="..\..\font.h" />
-    <ClInclude Include="..\..\fontglyph.h" />
-    <ClInclude Include="..\..\game.h" />
-    <ClInclude Include="..\..\global.h" />
-    <ClInclude Include="..\..\input.h" />
-    <ClInclude Include="..\..\itemmenu.h" />
-    <ClInclude Include="..\..\libmad\bit.h" />
-    <ClInclude Include="..\..\libmad\decoder.h" />
-    <ClInclude Include="..\..\libmad\fixed.h" />
-    <ClInclude Include="..\..\libmad\frame.h" />
-    <ClInclude Include="..\..\libmad\huffman.h" />
-    <ClInclude Include="..\..\libmad\layer12.h" />
-    <ClInclude Include="..\..\libmad\layer3.h" />
-    <ClInclude Include="..\..\libmad\libmad_config.h" />
-    <ClInclude Include="..\..\libmad\libmad_global.h" />
-    <ClInclude Include="..\..\libmad\mad.h" />
-    <ClInclude Include="..\..\libmad\music_mad.h" />
-    <ClInclude Include="..\..\libmad\stream.h" />
-    <ClInclude Include="..\..\libmad\synth.h" />
-    <ClInclude Include="..\..\libmad\timer.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\config_types.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\ogg.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\os_types.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\codec.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisenc.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisfile.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\backends.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\bitrate.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_stereo.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\floor\floor_books.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\codebook.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\codec_internal.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\envelope.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\highlevel.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lookup.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lookup_data.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lpc.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lsp.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\masking.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\mdct.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\misc.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\floor_all.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_11.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44p51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44u.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_11.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_22.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_32.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44p51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44u.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_X.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\os.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\psy.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\registry.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\scales.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\smallft.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\window.h" />
-    <ClInclude Include="..\..\magicmenu.h" />
-    <ClInclude Include="..\..\main.h" />
-    <ClInclude Include="..\..\map.h" />
-    <ClInclude Include="..\..\midi.h" />
-    <ClInclude Include="..\..\palcfg.h" />
-    <ClInclude Include="..\..\palcommon.h" />
-    <ClInclude Include="..\..\palette.h" />
-    <ClInclude Include="..\..\play.h" />
-    <ClInclude Include="..\..\players.h" />
-    <ClInclude Include="..\..\res.h" />
-    <ClInclude Include="..\..\resampler.h" />
-    <ClInclude Include="..\..\rngplay.h" />
-    <ClInclude Include="..\..\scene.h" />
-    <ClInclude Include="..\..\script.h" />
-    <ClInclude Include="..\..\audio.h" />
-    <ClInclude Include="..\..\text.h" />
-    <ClInclude Include="..\..\ui.h" />
-    <ClInclude Include="..\..\uibattle.h" />
-    <ClInclude Include="..\..\uigame.h" />
-    <ClInclude Include="..\..\util.h" />
-    <ClInclude Include="..\..\video.h" />
+    <ClInclude Include="..\..\src\adplug\adlibemu.h" />
+    <ClInclude Include="..\..\src\adplug\binfile.h" />
+    <ClInclude Include="..\..\src\adplug\binio.h" />
+    <ClInclude Include="..\..\src\adplug\dbemuopl.h" />
+    <ClInclude Include="..\..\src\adplug\dbopl.h" />
+    <ClInclude Include="..\..\src\adplug\demuopl.h" />
+    <ClInclude Include="..\..\src\adplug\dosbox_opl.h" />
+    <ClInclude Include="..\..\src\adplug\emuopl.h" />
+    <ClInclude Include="..\..\src\adplug\fmopl.h" />
+    <ClInclude Include="..\..\src\adplug\fprovide.h" />
+    <ClInclude Include="..\..\src\adplug\opl.h" />
+    <ClInclude Include="..\..\src\adplug\player.h" />
+    <ClInclude Include="..\..\src\adplug\rix.h" />
+    <ClInclude Include="..\..\src\adplug\surroundopl.h" />
+    <ClInclude Include="..\..\src\ascii.h" />
+    <ClInclude Include="..\..\src\battle.h" />
+    <ClInclude Include="..\..\src\codepage.h" />
+    <ClInclude Include="..\..\src\common.h" />
+    <ClInclude Include="..\..\src\ending.h" />
+    <ClInclude Include="..\..\src\fight.h" />
+    <ClInclude Include="..\..\src\font.h" />
+    <ClInclude Include="..\..\src\fontglyph.h" />
+    <ClInclude Include="..\..\src\game.h" />
+    <ClInclude Include="..\..\src\global.h" />
+    <ClInclude Include="..\..\src\input.h" />
+    <ClInclude Include="..\..\src\itemmenu.h" />
+    <ClInclude Include="..\..\src\libmad\bit.h" />
+    <ClInclude Include="..\..\src\libmad\decoder.h" />
+    <ClInclude Include="..\..\src\libmad\fixed.h" />
+    <ClInclude Include="..\..\src\libmad\frame.h" />
+    <ClInclude Include="..\..\src\libmad\huffman.h" />
+    <ClInclude Include="..\..\src\libmad\layer12.h" />
+    <ClInclude Include="..\..\src\libmad\layer3.h" />
+    <ClInclude Include="..\..\src\libmad\libmad_config.h" />
+    <ClInclude Include="..\..\src\libmad\libmad_global.h" />
+    <ClInclude Include="..\..\src\libmad\mad.h" />
+    <ClInclude Include="..\..\src\libmad\music_mad.h" />
+    <ClInclude Include="..\..\src\libmad\stream.h" />
+    <ClInclude Include="..\..\src\libmad\synth.h" />
+    <ClInclude Include="..\..\src\libmad\timer.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\config_types.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\ogg.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\os_types.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\codec.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisenc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisfile.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\backends.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\bitrate.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_stereo.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\floor\floor_books.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\codebook.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\codec_internal.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\envelope.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\highlevel.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup_data.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lpc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lsp.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\masking.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\mdct.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\misc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\floor_all.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_11.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44p51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44u.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_11.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_22.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_32.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44p51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44u.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_X.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\os.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\psy.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\registry.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\scales.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\smallft.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\window.h" />
+    <ClInclude Include="..\..\src\magicmenu.h" />
+    <ClInclude Include="..\..\src\main.h" />
+    <ClInclude Include="..\..\src\map.h" />
+    <ClInclude Include="..\..\src\midi.h" />
+    <ClInclude Include="..\..\src\palcfg.h" />
+    <ClInclude Include="..\..\src\palcommon.h" />
+    <ClInclude Include="..\..\src\palette.h" />
+    <ClInclude Include="..\..\src\play.h" />
+    <ClInclude Include="..\..\src\players.h" />
+    <ClInclude Include="..\..\src\res.h" />
+    <ClInclude Include="..\..\src\resampler.h" />
+    <ClInclude Include="..\..\src\rngplay.h" />
+    <ClInclude Include="..\..\src\scene.h" />
+    <ClInclude Include="..\..\src\script.h" />
+    <ClInclude Include="..\..\src\audio.h" />
+    <ClInclude Include="..\..\src\text.h" />
+    <ClInclude Include="..\..\src\ui.h" />
+    <ClInclude Include="..\..\src\uibattle.h" />
+    <ClInclude Include="..\..\src\uigame.h" />
+    <ClInclude Include="..\..\src\util.h" />
+    <ClInclude Include="..\..\src\video.h" />
     <ClInclude Include="..\pal_config.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\adplug\adlibemu.c" />
-    <ClCompile Include="..\..\adplug\binfile.cpp" />
-    <ClCompile Include="..\..\adplug\binio.cpp" />
-    <ClCompile Include="..\..\adplug\dbemuopl.cpp" />
-    <ClCompile Include="..\..\adplug\dbopl.cpp" />
-    <ClCompile Include="..\..\adplug\demuopl.cpp" />
-    <ClCompile Include="..\..\adplug\dosbox_opl.cpp" />
-    <ClCompile Include="..\..\adplug\emuopl.cpp" />
-    <ClCompile Include="..\..\adplug\fmopl.c" />
-    <ClCompile Include="..\..\adplug\fprovide.cpp" />
-    <ClCompile Include="..\..\adplug\player.cpp" />
-    <ClCompile Include="..\..\adplug\rix.cpp" />
-    <ClCompile Include="..\..\adplug\surroundopl.cpp" />
-    <ClCompile Include="..\..\audio.c" />
-    <ClCompile Include="..\..\battle.c" />
-    <ClCompile Include="..\..\ending.c" />
-    <ClCompile Include="..\..\fight.c" />
-    <ClCompile Include="..\..\font.c" />
-    <ClCompile Include="..\..\game.c" />
-    <ClCompile Include="..\..\global.c" />
-    <ClCompile Include="..\..\input.c" />
-    <ClCompile Include="..\..\itemmenu.c" />
-    <ClCompile Include="..\..\libmad\bit.c" />
-    <ClCompile Include="..\..\libmad\decoder.c" />
-    <ClCompile Include="..\..\libmad\fixed.c" />
-    <ClCompile Include="..\..\libmad\frame.c" />
-    <ClCompile Include="..\..\libmad\huffman.c" />
-    <ClCompile Include="..\..\libmad\layer12.c" />
-    <ClCompile Include="..\..\libmad\layer3.c" />
-    <ClCompile Include="..\..\libmad\music_mad.c" />
-    <ClCompile Include="..\..\libmad\stream.c" />
-    <ClCompile Include="..\..\libmad\synth.c" />
-    <ClCompile Include="..\..\libmad\timer.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\analysis.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\bitrate.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\bitwise.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\block.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\codebook.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\envelope.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\floor0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\floor1.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\framing.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\info.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lookup.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lpc.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lsp.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\mapping0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\mdct.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\psy.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\registry.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\res0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\sharedbook.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\smallft.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\synthesis.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisenc.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisfile.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\window.c" />
-    <ClCompile Include="..\..\magicmenu.c" />
-    <ClCompile Include="..\..\main.c" />
-    <ClCompile Include="..\..\map.c" />
-    <ClCompile Include="..\..\mp3play.c" />
-    <ClCompile Include="..\..\oggplay.c" />
-    <ClCompile Include="..\..\overlay.c" />
-    <ClCompile Include="..\..\palcfg.c" />
-    <ClCompile Include="..\..\palcommon.c" />
-    <ClCompile Include="..\..\palette.c" />
-    <ClCompile Include="..\..\play.c" />
-    <ClCompile Include="..\..\res.c" />
-    <ClCompile Include="..\..\resampler.c" />
-    <ClCompile Include="..\..\rixplay.cpp" />
-    <ClCompile Include="..\..\rngplay.c" />
-    <ClCompile Include="..\..\scene.c" />
-    <ClCompile Include="..\..\script.c" />
-    <ClCompile Include="..\..\sound.c" />
-    <ClCompile Include="..\..\text.c" />
-    <ClCompile Include="..\..\ui.c" />
-    <ClCompile Include="..\..\uibattle.c" />
-    <ClCompile Include="..\..\uigame.c" />
-    <ClCompile Include="..\..\util.c" />
-    <ClCompile Include="..\..\video.c" />
-    <ClCompile Include="..\..\yj1.c" />
+    <ClCompile Include="..\..\src\adplug\adlibemu.c" />
+    <ClCompile Include="..\..\src\adplug\binfile.cpp" />
+    <ClCompile Include="..\..\src\adplug\binio.cpp" />
+    <ClCompile Include="..\..\src\adplug\dbemuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\dbopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\demuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\dosbox_opl.cpp" />
+    <ClCompile Include="..\..\src\adplug\emuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\fmopl.c" />
+    <ClCompile Include="..\..\src\adplug\fprovide.cpp" />
+    <ClCompile Include="..\..\src\adplug\player.cpp" />
+    <ClCompile Include="..\..\src\adplug\rix.cpp" />
+    <ClCompile Include="..\..\src\adplug\surroundopl.cpp" />
+    <ClCompile Include="..\..\src\audio.c" />
+    <ClCompile Include="..\..\src\battle.c" />
+    <ClCompile Include="..\..\src\ending.c" />
+    <ClCompile Include="..\..\src\fight.c" />
+    <ClCompile Include="..\..\src\font.c" />
+    <ClCompile Include="..\..\src\game.c" />
+    <ClCompile Include="..\..\src\global.c" />
+    <ClCompile Include="..\..\src\input.c" />
+    <ClCompile Include="..\..\src\itemmenu.c" />
+    <ClCompile Include="..\..\src\libmad\bit.c" />
+    <ClCompile Include="..\..\src\libmad\decoder.c" />
+    <ClCompile Include="..\..\src\libmad\fixed.c" />
+    <ClCompile Include="..\..\src\libmad\frame.c" />
+    <ClCompile Include="..\..\src\libmad\huffman.c" />
+    <ClCompile Include="..\..\src\libmad\layer12.c" />
+    <ClCompile Include="..\..\src\libmad\layer3.c" />
+    <ClCompile Include="..\..\src\libmad\music_mad.c" />
+    <ClCompile Include="..\..\src\libmad\stream.c" />
+    <ClCompile Include="..\..\src\libmad\synth.c" />
+    <ClCompile Include="..\..\src\libmad\timer.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\analysis.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitrate.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitwise.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\block.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\codebook.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\envelope.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor1.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\framing.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\info.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lookup.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lpc.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lsp.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\mapping0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\mdct.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\psy.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\registry.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\res0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\sharedbook.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\smallft.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\synthesis.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisenc.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisfile.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\window.c" />
+    <ClCompile Include="..\..\src\magicmenu.c" />
+    <ClCompile Include="..\..\src\main.c" />
+    <ClCompile Include="..\..\src\map.c" />
+    <ClCompile Include="..\..\src\mp3play.c" />
+    <ClCompile Include="..\..\src\oggplay.c" />
+    <ClCompile Include="..\..\src\overlay.c" />
+    <ClCompile Include="..\..\src\palcfg.c" />
+    <ClCompile Include="..\..\src\palcommon.c" />
+    <ClCompile Include="..\..\src\palette.c" />
+    <ClCompile Include="..\..\src\play.c" />
+    <ClCompile Include="..\..\src\res.c" />
+    <ClCompile Include="..\..\src\resampler.c" />
+    <ClCompile Include="..\..\src\rixplay.cpp" />
+    <ClCompile Include="..\..\src\rngplay.c" />
+    <ClCompile Include="..\..\src\scene.c" />
+    <ClCompile Include="..\..\src\script.c" />
+    <ClCompile Include="..\..\src\sound.c" />
+    <ClCompile Include="..\..\src\text.c" />
+    <ClCompile Include="..\..\src\ui.c" />
+    <ClCompile Include="..\..\src\uibattle.c" />
+    <ClCompile Include="..\..\src\uigame.c" />
+    <ClCompile Include="..\..\src\util.c" />
+    <ClCompile Include="..\..\src\video.c" />
+    <ClCompile Include="..\..\src\yj1.c" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\libmad\D.dat" />
-    <None Include="..\libmad\imdct_s.dat" />
-    <None Include="..\libmad\qc_table.dat" />
-    <None Include="..\libmad\rq_table.dat" />
-    <None Include="..\libmad\sf_table.dat" />
+    <None Include="..\..\src\libmad\D.dat" />
+    <None Include="..\..\src\libmad\imdct_s.dat" />
+    <None Include="..\..\src\libmad\qc_table.dat" />
+    <None Include="..\..\src\libmad\rq_table.dat" />
+    <None Include="..\..\src\libmad\sf_table.dat" />
   </ItemGroup>
 </Project>

winrt/SDLPal.UWP/SDLPal.Core.vcxproj.filters

@@ -47,331 +47,331 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\adplug\binfile.h">
+    <ClInclude Include="..\..\src\adplug\binfile.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\binio.h">
+    <ClInclude Include="..\..\src\adplug\binio.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\demuopl.h">
+    <ClInclude Include="..\..\src\adplug\demuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dosbox_opl.h">
+    <ClInclude Include="..\..\src\adplug\dosbox_opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\emuopl.h">
+    <ClInclude Include="..\..\src\adplug\emuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\fmopl.h">
+    <ClInclude Include="..\..\src\adplug\fmopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\fprovide.h">
+    <ClInclude Include="..\..\src\adplug\fprovide.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\opl.h">
+    <ClInclude Include="..\..\src\adplug\opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\player.h">
+    <ClInclude Include="..\..\src\adplug\player.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\rix.h">
+    <ClInclude Include="..\..\src\adplug\rix.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\surroundopl.h">
+    <ClInclude Include="..\..\src\adplug\surroundopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\adlibemu.h">
+    <ClInclude Include="..\..\src\adplug\adlibemu.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dbemuopl.h">
+    <ClInclude Include="..\..\src\adplug\dbemuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dbopl.h">
+    <ClInclude Include="..\..\src\adplug\dbopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\config_types.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\config_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\ogg.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\ogg.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\os_types.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\os_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\codec.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\codec.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisenc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisenc.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisfile.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisfile.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_51.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_stereo.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_stereo.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\floor\floor_books.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\floor\floor_books.h">
       <Filter>liboggvorbis\src\books\floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
       <Filter>liboggvorbis\src\books\uncoupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\floor_all.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\floor_all.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_11.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44p51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44u.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_11.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_22.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_22.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_32.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_32.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44p51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44u.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_X.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_X.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\backends.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\backends.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\bitrate.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\bitrate.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\codebook.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\codebook.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\codec_internal.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\codec_internal.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\envelope.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\envelope.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\highlevel.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\highlevel.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lookup.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lookup_data.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup_data.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lpc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lpc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lsp.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lsp.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\masking.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\masking.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\mdct.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\mdct.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\misc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\misc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\os.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\os.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\psy.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\psy.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\registry.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\registry.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\scales.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\scales.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\smallft.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\smallft.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\window.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\window.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\bit.h">
+    <ClInclude Include="..\..\src\libmad\bit.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\decoder.h">
+    <ClInclude Include="..\..\src\libmad\decoder.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\fixed.h">
+    <ClInclude Include="..\..\src\libmad\fixed.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\frame.h">
+    <ClInclude Include="..\..\src\libmad\frame.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\huffman.h">
+    <ClInclude Include="..\..\src\libmad\huffman.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\layer3.h">
+    <ClInclude Include="..\..\src\libmad\layer3.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\layer12.h">
+    <ClInclude Include="..\..\src\libmad\layer12.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\libmad_config.h">
+    <ClInclude Include="..\..\src\libmad\libmad_config.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\libmad_global.h">
+    <ClInclude Include="..\..\src\libmad\libmad_global.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\mad.h">
+    <ClInclude Include="..\..\src\libmad\mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\music_mad.h">
+    <ClInclude Include="..\..\src\libmad\music_mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\stream.h">
+    <ClInclude Include="..\..\src\libmad\stream.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\synth.h">
+    <ClInclude Include="..\..\src\libmad\synth.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\timer.h">
+    <ClInclude Include="..\..\src\libmad\timer.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ascii.h">
+    <ClInclude Include="..\..\src\ascii.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\battle.h">
+    <ClInclude Include="..\..\src\battle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\codepage.h">
+    <ClInclude Include="..\..\src\codepage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common.h">
+    <ClInclude Include="..\..\src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ending.h">
+    <ClInclude Include="..\..\src\ending.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\fight.h">
+    <ClInclude Include="..\..\src\fight.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\font.h">
+    <ClInclude Include="..\..\src\font.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\fontglyph.h">
+    <ClInclude Include="..\..\src\fontglyph.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game.h">
+    <ClInclude Include="..\..\src\game.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\global.h">
+    <ClInclude Include="..\..\src\global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\input.h">
+    <ClInclude Include="..\..\src\input.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\itemmenu.h">
+    <ClInclude Include="..\..\src\itemmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\magicmenu.h">
+    <ClInclude Include="..\..\src\magicmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\main.h">
+    <ClInclude Include="..\..\src\main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\map.h">
+    <ClInclude Include="..\..\src\map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palcommon.h">
+    <ClInclude Include="..\..\src\palcommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palette.h">
+    <ClInclude Include="..\..\src\palette.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\play.h">
+    <ClInclude Include="..\..\src\play.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\res.h">
+    <ClInclude Include="..\..\src\res.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\rngplay.h">
+    <ClInclude Include="..\..\src\rngplay.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\scene.h">
+    <ClInclude Include="..\..\src\scene.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\script.h">
+    <ClInclude Include="..\..\src\script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\audio.h">
+    <ClInclude Include="..\..\src\audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\text.h">
+    <ClInclude Include="..\..\src\text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ui.h">
+    <ClInclude Include="..\..\src\ui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\uibattle.h">
+    <ClInclude Include="..\..\src\uibattle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\uigame.h">
+    <ClInclude Include="..\..\src\uigame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\util.h">
+    <ClInclude Include="..\..\src\util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\video.h">
+    <ClInclude Include="..\..\src\video.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\midi.h">
+    <ClInclude Include="..\..\src\midi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\players.h">
+    <ClInclude Include="..\..\src\players.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\resampler.h">
+    <ClInclude Include="..\..\src\resampler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palcfg.h">
+    <ClInclude Include="..\..\src\palcfg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\pal_config.h">
@@ -379,264 +379,264 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\adplug\binfile.cpp">
+    <ClCompile Include="..\..\src\adplug\binfile.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\binio.cpp">
+    <ClCompile Include="..\..\src\adplug\binio.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dosbox_opl.cpp">
+    <ClCompile Include="..\..\src\adplug\dosbox_opl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\emuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\emuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\fmopl.c">
+    <ClCompile Include="..\..\src\adplug\fmopl.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\fprovide.cpp">
+    <ClCompile Include="..\..\src\adplug\fprovide.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\player.cpp">
+    <ClCompile Include="..\..\src\adplug\player.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\rix.cpp">
+    <ClCompile Include="..\..\src\adplug\rix.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\surroundopl.cpp">
+    <ClCompile Include="..\..\src\adplug\surroundopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\adlibemu.c">
+    <ClCompile Include="..\..\src\adplug\adlibemu.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dbemuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\dbemuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dbopl.cpp">
+    <ClCompile Include="..\..\src\adplug\dbopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\demuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\demuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\audio.c">
+    <ClCompile Include="..\..\src\audio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\analysis.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\analysis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\bitrate.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitrate.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\bitwise.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitwise.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\block.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\block.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\codebook.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\codebook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\envelope.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\envelope.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\floor0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\floor1.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor1.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\framing.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\framing.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\info.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\info.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lookup.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lookup.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lpc.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lpc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lsp.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lsp.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\mapping0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\mapping0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\mdct.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\mdct.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\psy.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\psy.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\registry.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\registry.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\res0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\res0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\sharedbook.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\sharedbook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\smallft.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\smallft.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\synthesis.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\synthesis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisenc.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisenc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisfile.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisfile.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\window.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\window.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\bit.c">
+    <ClCompile Include="..\..\src\libmad\bit.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\decoder.c">
+    <ClCompile Include="..\..\src\libmad\decoder.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\fixed.c">
+    <ClCompile Include="..\..\src\libmad\fixed.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\frame.c">
+    <ClCompile Include="..\..\src\libmad\frame.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\huffman.c">
+    <ClCompile Include="..\..\src\libmad\huffman.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\layer3.c">
+    <ClCompile Include="..\..\src\libmad\layer3.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\layer12.c">
+    <ClCompile Include="..\..\src\libmad\layer12.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\music_mad.c">
+    <ClCompile Include="..\..\src\libmad\music_mad.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\stream.c">
+    <ClCompile Include="..\..\src\libmad\stream.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\synth.c">
+    <ClCompile Include="..\..\src\libmad\synth.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\timer.c">
+    <ClCompile Include="..\..\src\libmad\timer.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\battle.c">
+    <ClCompile Include="..\..\src\battle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ending.c">
+    <ClCompile Include="..\..\src\ending.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\fight.c">
+    <ClCompile Include="..\..\src\fight.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\font.c">
+    <ClCompile Include="..\..\src\font.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\game.c">
+    <ClCompile Include="..\..\src\game.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\global.c">
+    <ClCompile Include="..\..\src\global.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\input.c">
+    <ClCompile Include="..\..\src\input.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\itemmenu.c">
+    <ClCompile Include="..\..\src\itemmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\magicmenu.c">
+    <ClCompile Include="..\..\src\magicmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\main.c">
+    <ClCompile Include="..\..\src\main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\map.c">
+    <ClCompile Include="..\..\src\map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palcommon.c">
+    <ClCompile Include="..\..\src\palcommon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palette.c">
+    <ClCompile Include="..\..\src\palette.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\play.c">
+    <ClCompile Include="..\..\src\play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\res.c">
+    <ClCompile Include="..\..\src\res.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\rixplay.cpp">
+    <ClCompile Include="..\..\src\rixplay.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\rngplay.c">
+    <ClCompile Include="..\..\src\rngplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\scene.c">
+    <ClCompile Include="..\..\src\scene.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\script.c">
+    <ClCompile Include="..\..\src\script.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sound.c">
+    <ClCompile Include="..\..\src\sound.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\text.c">
+    <ClCompile Include="..\..\src\text.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ui.c">
+    <ClCompile Include="..\..\src\ui.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\uibattle.c">
+    <ClCompile Include="..\..\src\uibattle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\uigame.c">
+    <ClCompile Include="..\..\src\uigame.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\util.c">
+    <ClCompile Include="..\..\src\util.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\video.c">
+    <ClCompile Include="..\..\src\video.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\yj1.c">
+    <ClCompile Include="..\..\src\yj1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mp3play.c">
+    <ClCompile Include="..\..\src\mp3play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\oggplay.c">
+    <ClCompile Include="..\..\src\oggplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\resampler.c">
+    <ClCompile Include="..\..\src\resampler.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\overlay.c">
+    <ClCompile Include="..\..\src\overlay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palcfg.c">
+    <ClCompile Include="..\..\src\palcfg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\libmad\D.dat">
+    <None Include="..\..\src\libmad\D.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\imdct_s.dat">
+    <None Include="..\..\src\libmad\imdct_s.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\qc_table.dat">
+    <None Include="..\..\src\libmad\qc_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\rq_table.dat">
+    <None Include="..\..\src\libmad\rq_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\sf_table.dat">
+    <None Include="..\..\src\libmad\sf_table.dat">
       <Filter>libmad</Filter>
     </None>
   </ItemGroup>

winrt/SDLPal.UWP/SDLPal.UWP.vcxproj

@@ -165,7 +165,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir)../SDLPal.Common;$(OutDir)../SDLPal.Core</AdditionalLibraryDirectories>
-      <AdditionalDependencies>dxgi.lib;dxguid.lib;sdlpal.common.lib;sdlpal.core.lib;vccorlibd.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dxgi.lib;dxguid.lib;sdlpal.core.lib;sdlpal.common.lib;vccorlibd.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>vccorlibd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
@@ -178,7 +178,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir)../SDLPal.Common;$(OutDir)../SDLPal.Core</AdditionalLibraryDirectories>
-      <AdditionalDependencies>dxgi.lib;dxguid.lib;sdlpal.common.lib;sdlpal.core.lib;vccorlib.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dxgi.lib;dxguid.lib;sdlpal.core.lib;sdlpal.common.lib;vccorlib.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>vccorlib.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>

winrt/SDLPal.Windows/SDLPal.Core.vcxproj

@@ -133,7 +133,7 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -144,7 +144,7 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -155,7 +155,7 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -166,7 +166,7 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -177,7 +177,7 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -188,7 +188,7 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>LONGJMP_EXIT;PAL_HAS_PLATFORM_SPECIFIC_UTILS;_CRT_SECURE_NO_WARNINGS;__WINRT__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -197,205 +197,205 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\adplug\adlibemu.h" />
-    <ClInclude Include="..\..\adplug\binfile.h" />
-    <ClInclude Include="..\..\adplug\binio.h" />
-    <ClInclude Include="..\..\adplug\dbemuopl.h" />
-    <ClInclude Include="..\..\adplug\dbopl.h" />
-    <ClInclude Include="..\..\adplug\demuopl.h" />
-    <ClInclude Include="..\..\adplug\dosbox_opl.h" />
-    <ClInclude Include="..\..\adplug\emuopl.h" />
-    <ClInclude Include="..\..\adplug\fmopl.h" />
-    <ClInclude Include="..\..\adplug\fprovide.h" />
-    <ClInclude Include="..\..\adplug\opl.h" />
-    <ClInclude Include="..\..\adplug\player.h" />
-    <ClInclude Include="..\..\adplug\rix.h" />
-    <ClInclude Include="..\..\adplug\surroundopl.h" />
-    <ClInclude Include="..\..\ascii.h" />
-    <ClInclude Include="..\..\battle.h" />
-    <ClInclude Include="..\..\codepage.h" />
-    <ClInclude Include="..\..\common.h" />
-    <ClInclude Include="..\..\ending.h" />
-    <ClInclude Include="..\..\fight.h" />
-    <ClInclude Include="..\..\font.h" />
-    <ClInclude Include="..\..\fontglyph.h" />
-    <ClInclude Include="..\..\game.h" />
-    <ClInclude Include="..\..\global.h" />
-    <ClInclude Include="..\..\input.h" />
-    <ClInclude Include="..\..\itemmenu.h" />
-    <ClInclude Include="..\..\libmad\bit.h" />
-    <ClInclude Include="..\..\libmad\decoder.h" />
-    <ClInclude Include="..\..\libmad\fixed.h" />
-    <ClInclude Include="..\..\libmad\frame.h" />
-    <ClInclude Include="..\..\libmad\huffman.h" />
-    <ClInclude Include="..\..\libmad\layer12.h" />
-    <ClInclude Include="..\..\libmad\layer3.h" />
-    <ClInclude Include="..\..\libmad\libmad_config.h" />
-    <ClInclude Include="..\..\libmad\libmad_global.h" />
-    <ClInclude Include="..\..\libmad\mad.h" />
-    <ClInclude Include="..\..\libmad\music_mad.h" />
-    <ClInclude Include="..\..\libmad\stream.h" />
-    <ClInclude Include="..\..\libmad\synth.h" />
-    <ClInclude Include="..\..\libmad\timer.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\config_types.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\ogg.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\os_types.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\codec.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisenc.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisfile.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\backends.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\bitrate.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_stereo.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\floor\floor_books.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\codebook.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\codec_internal.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\envelope.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\highlevel.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lookup.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lookup_data.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lpc.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lsp.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\masking.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\mdct.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\misc.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\floor_all.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_11.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44p51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44u.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_11.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_22.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_32.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44p51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44u.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_X.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\os.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\psy.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\registry.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\scales.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\smallft.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\window.h" />
-    <ClInclude Include="..\..\magicmenu.h" />
-    <ClInclude Include="..\..\main.h" />
-    <ClInclude Include="..\..\map.h" />
-    <ClInclude Include="..\..\midi.h" />
-    <ClInclude Include="..\..\palcfg.h" />
-    <ClInclude Include="..\..\palcommon.h" />
-    <ClInclude Include="..\..\palette.h" />
-    <ClInclude Include="..\..\play.h" />
-    <ClInclude Include="..\..\players.h" />
-    <ClInclude Include="..\..\res.h" />
-    <ClInclude Include="..\..\resampler.h" />
-    <ClInclude Include="..\..\rngplay.h" />
-    <ClInclude Include="..\..\scene.h" />
-    <ClInclude Include="..\..\script.h" />
-    <ClInclude Include="..\..\audio.h" />
-    <ClInclude Include="..\..\text.h" />
-    <ClInclude Include="..\..\ui.h" />
-    <ClInclude Include="..\..\uibattle.h" />
-    <ClInclude Include="..\..\uigame.h" />
-    <ClInclude Include="..\..\util.h" />
-    <ClInclude Include="..\..\video.h" />
+    <ClInclude Include="..\..\src\adplug\adlibemu.h" />
+    <ClInclude Include="..\..\src\adplug\binfile.h" />
+    <ClInclude Include="..\..\src\adplug\binio.h" />
+    <ClInclude Include="..\..\src\adplug\dbemuopl.h" />
+    <ClInclude Include="..\..\src\adplug\dbopl.h" />
+    <ClInclude Include="..\..\src\adplug\demuopl.h" />
+    <ClInclude Include="..\..\src\adplug\dosbox_opl.h" />
+    <ClInclude Include="..\..\src\adplug\emuopl.h" />
+    <ClInclude Include="..\..\src\adplug\fmopl.h" />
+    <ClInclude Include="..\..\src\adplug\fprovide.h" />
+    <ClInclude Include="..\..\src\adplug\opl.h" />
+    <ClInclude Include="..\..\src\adplug\player.h" />
+    <ClInclude Include="..\..\src\adplug\rix.h" />
+    <ClInclude Include="..\..\src\adplug\surroundopl.h" />
+    <ClInclude Include="..\..\src\ascii.h" />
+    <ClInclude Include="..\..\src\battle.h" />
+    <ClInclude Include="..\..\src\codepage.h" />
+    <ClInclude Include="..\..\src\common.h" />
+    <ClInclude Include="..\..\src\ending.h" />
+    <ClInclude Include="..\..\src\fight.h" />
+    <ClInclude Include="..\..\src\font.h" />
+    <ClInclude Include="..\..\src\fontglyph.h" />
+    <ClInclude Include="..\..\src\game.h" />
+    <ClInclude Include="..\..\src\global.h" />
+    <ClInclude Include="..\..\src\input.h" />
+    <ClInclude Include="..\..\src\itemmenu.h" />
+    <ClInclude Include="..\..\src\libmad\bit.h" />
+    <ClInclude Include="..\..\src\libmad\decoder.h" />
+    <ClInclude Include="..\..\src\libmad\fixed.h" />
+    <ClInclude Include="..\..\src\libmad\frame.h" />
+    <ClInclude Include="..\..\src\libmad\huffman.h" />
+    <ClInclude Include="..\..\src\libmad\layer12.h" />
+    <ClInclude Include="..\..\src\libmad\layer3.h" />
+    <ClInclude Include="..\..\src\libmad\libmad_config.h" />
+    <ClInclude Include="..\..\src\libmad\libmad_global.h" />
+    <ClInclude Include="..\..\src\libmad\mad.h" />
+    <ClInclude Include="..\..\src\libmad\music_mad.h" />
+    <ClInclude Include="..\..\src\libmad\stream.h" />
+    <ClInclude Include="..\..\src\libmad\synth.h" />
+    <ClInclude Include="..\..\src\libmad\timer.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\config_types.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\ogg.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\os_types.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\codec.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisenc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisfile.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\backends.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\bitrate.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_stereo.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\floor\floor_books.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\codebook.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\codec_internal.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\envelope.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\highlevel.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup_data.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lpc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lsp.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\masking.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\mdct.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\misc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\floor_all.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_11.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44p51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44u.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_11.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_22.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_32.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44p51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44u.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_X.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\os.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\psy.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\registry.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\scales.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\smallft.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\window.h" />
+    <ClInclude Include="..\..\src\magicmenu.h" />
+    <ClInclude Include="..\..\src\main.h" />
+    <ClInclude Include="..\..\src\map.h" />
+    <ClInclude Include="..\..\src\midi.h" />
+    <ClInclude Include="..\..\src\palcfg.h" />
+    <ClInclude Include="..\..\src\palcommon.h" />
+    <ClInclude Include="..\..\src\palette.h" />
+    <ClInclude Include="..\..\src\play.h" />
+    <ClInclude Include="..\..\src\players.h" />
+    <ClInclude Include="..\..\src\res.h" />
+    <ClInclude Include="..\..\src\resampler.h" />
+    <ClInclude Include="..\..\src\rngplay.h" />
+    <ClInclude Include="..\..\src\scene.h" />
+    <ClInclude Include="..\..\src\script.h" />
+    <ClInclude Include="..\..\src\audio.h" />
+    <ClInclude Include="..\..\src\text.h" />
+    <ClInclude Include="..\..\src\ui.h" />
+    <ClInclude Include="..\..\src\uibattle.h" />
+    <ClInclude Include="..\..\src\uigame.h" />
+    <ClInclude Include="..\..\src\util.h" />
+    <ClInclude Include="..\..\src\video.h" />
     <ClInclude Include="..\pal_config.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\adplug\adlibemu.c" />
-    <ClCompile Include="..\..\adplug\binfile.cpp" />
-    <ClCompile Include="..\..\adplug\binio.cpp" />
-    <ClCompile Include="..\..\adplug\dbemuopl.cpp" />
-    <ClCompile Include="..\..\adplug\dbopl.cpp" />
-    <ClCompile Include="..\..\adplug\demuopl.cpp" />
-    <ClCompile Include="..\..\adplug\dosbox_opl.cpp" />
-    <ClCompile Include="..\..\adplug\emuopl.cpp" />
-    <ClCompile Include="..\..\adplug\fmopl.c" />
-    <ClCompile Include="..\..\adplug\fprovide.cpp" />
-    <ClCompile Include="..\..\adplug\player.cpp" />
-    <ClCompile Include="..\..\adplug\rix.cpp" />
-    <ClCompile Include="..\..\adplug\surroundopl.cpp" />
-    <ClCompile Include="..\..\audio.c" />
-    <ClCompile Include="..\..\battle.c" />
-    <ClCompile Include="..\..\ending.c" />
-    <ClCompile Include="..\..\fight.c" />
-    <ClCompile Include="..\..\font.c" />
-    <ClCompile Include="..\..\game.c" />
-    <ClCompile Include="..\..\global.c" />
-    <ClCompile Include="..\..\input.c" />
-    <ClCompile Include="..\..\itemmenu.c" />
-    <ClCompile Include="..\..\libmad\bit.c" />
-    <ClCompile Include="..\..\libmad\decoder.c" />
-    <ClCompile Include="..\..\libmad\fixed.c" />
-    <ClCompile Include="..\..\libmad\frame.c" />
-    <ClCompile Include="..\..\libmad\huffman.c" />
-    <ClCompile Include="..\..\libmad\layer12.c" />
-    <ClCompile Include="..\..\libmad\layer3.c" />
-    <ClCompile Include="..\..\libmad\music_mad.c" />
-    <ClCompile Include="..\..\libmad\stream.c" />
-    <ClCompile Include="..\..\libmad\synth.c" />
-    <ClCompile Include="..\..\libmad\timer.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\analysis.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\bitrate.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\bitwise.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\block.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\codebook.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\envelope.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\floor0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\floor1.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\framing.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\info.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lookup.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lpc.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lsp.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\mapping0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\mdct.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\psy.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\registry.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\res0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\sharedbook.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\smallft.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\synthesis.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisenc.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisfile.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\window.c" />
-    <ClCompile Include="..\..\magicmenu.c" />
-    <ClCompile Include="..\..\main.c" />
-    <ClCompile Include="..\..\map.c" />
-    <ClCompile Include="..\..\mp3play.c" />
-    <ClCompile Include="..\..\oggplay.c" />
-    <ClCompile Include="..\..\overlay.c" />
-    <ClCompile Include="..\..\palcfg.c" />
-    <ClCompile Include="..\..\palcommon.c" />
-    <ClCompile Include="..\..\palette.c" />
-    <ClCompile Include="..\..\play.c" />
-    <ClCompile Include="..\..\res.c" />
-    <ClCompile Include="..\..\resampler.c" />
-    <ClCompile Include="..\..\rixplay.cpp" />
-    <ClCompile Include="..\..\rngplay.c" />
-    <ClCompile Include="..\..\scene.c" />
-    <ClCompile Include="..\..\script.c" />
-    <ClCompile Include="..\..\sound.c" />
-    <ClCompile Include="..\..\text.c" />
-    <ClCompile Include="..\..\ui.c" />
-    <ClCompile Include="..\..\uibattle.c" />
-    <ClCompile Include="..\..\uigame.c" />
-    <ClCompile Include="..\..\util.c" />
-    <ClCompile Include="..\..\video.c" />
-    <ClCompile Include="..\..\yj1.c" />
+    <ClCompile Include="..\..\src\adplug\adlibemu.c" />
+    <ClCompile Include="..\..\src\adplug\binfile.cpp" />
+    <ClCompile Include="..\..\src\adplug\binio.cpp" />
+    <ClCompile Include="..\..\src\adplug\dbemuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\dbopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\demuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\dosbox_opl.cpp" />
+    <ClCompile Include="..\..\src\adplug\emuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\fmopl.c" />
+    <ClCompile Include="..\..\src\adplug\fprovide.cpp" />
+    <ClCompile Include="..\..\src\adplug\player.cpp" />
+    <ClCompile Include="..\..\src\adplug\rix.cpp" />
+    <ClCompile Include="..\..\src\adplug\surroundopl.cpp" />
+    <ClCompile Include="..\..\src\audio.c" />
+    <ClCompile Include="..\..\src\battle.c" />
+    <ClCompile Include="..\..\src\ending.c" />
+    <ClCompile Include="..\..\src\fight.c" />
+    <ClCompile Include="..\..\src\font.c" />
+    <ClCompile Include="..\..\src\game.c" />
+    <ClCompile Include="..\..\src\global.c" />
+    <ClCompile Include="..\..\src\input.c" />
+    <ClCompile Include="..\..\src\itemmenu.c" />
+    <ClCompile Include="..\..\src\libmad\bit.c" />
+    <ClCompile Include="..\..\src\libmad\decoder.c" />
+    <ClCompile Include="..\..\src\libmad\fixed.c" />
+    <ClCompile Include="..\..\src\libmad\frame.c" />
+    <ClCompile Include="..\..\src\libmad\huffman.c" />
+    <ClCompile Include="..\..\src\libmad\layer12.c" />
+    <ClCompile Include="..\..\src\libmad\layer3.c" />
+    <ClCompile Include="..\..\src\libmad\music_mad.c" />
+    <ClCompile Include="..\..\src\libmad\stream.c" />
+    <ClCompile Include="..\..\src\libmad\synth.c" />
+    <ClCompile Include="..\..\src\libmad\timer.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\analysis.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitrate.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitwise.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\block.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\codebook.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\envelope.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor1.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\framing.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\info.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lookup.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lpc.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lsp.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\mapping0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\mdct.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\psy.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\registry.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\res0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\sharedbook.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\smallft.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\synthesis.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisenc.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisfile.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\window.c" />
+    <ClCompile Include="..\..\src\magicmenu.c" />
+    <ClCompile Include="..\..\src\main.c" />
+    <ClCompile Include="..\..\src\map.c" />
+    <ClCompile Include="..\..\src\mp3play.c" />
+    <ClCompile Include="..\..\src\oggplay.c" />
+    <ClCompile Include="..\..\src\overlay.c" />
+    <ClCompile Include="..\..\src\palcfg.c" />
+    <ClCompile Include="..\..\src\palcommon.c" />
+    <ClCompile Include="..\..\src\palette.c" />
+    <ClCompile Include="..\..\src\play.c" />
+    <ClCompile Include="..\..\src\res.c" />
+    <ClCompile Include="..\..\src\resampler.c" />
+    <ClCompile Include="..\..\src\rixplay.cpp" />
+    <ClCompile Include="..\..\src\rngplay.c" />
+    <ClCompile Include="..\..\src\scene.c" />
+    <ClCompile Include="..\..\src\script.c" />
+    <ClCompile Include="..\..\src\sound.c" />
+    <ClCompile Include="..\..\src\text.c" />
+    <ClCompile Include="..\..\src\ui.c" />
+    <ClCompile Include="..\..\src\uibattle.c" />
+    <ClCompile Include="..\..\src\uigame.c" />
+    <ClCompile Include="..\..\src\util.c" />
+    <ClCompile Include="..\..\src\video.c" />
+    <ClCompile Include="..\..\src\yj1.c" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\libmad\D.dat" />
-    <None Include="..\libmad\imdct_s.dat" />
-    <None Include="..\libmad\qc_table.dat" />
-    <None Include="..\libmad\rq_table.dat" />
-    <None Include="..\libmad\sf_table.dat" />
+    <None Include="..\..\src\libmad\D.dat" />
+    <None Include="..\..\src\libmad\imdct_s.dat" />
+    <None Include="..\..\src\libmad\qc_table.dat" />
+    <None Include="..\..\src\libmad\rq_table.dat" />
+    <None Include="..\..\src\libmad\sf_table.dat" />
   </ItemGroup>
 </Project>

winrt/SDLPal.Windows/SDLPal.Core.vcxproj.filters

@@ -47,331 +47,331 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\adplug\binfile.h">
+    <ClInclude Include="..\..\src\adplug\binfile.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\binio.h">
+    <ClInclude Include="..\..\src\adplug\binio.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\demuopl.h">
+    <ClInclude Include="..\..\src\adplug\demuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dosbox_opl.h">
+    <ClInclude Include="..\..\src\adplug\dosbox_opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\emuopl.h">
+    <ClInclude Include="..\..\src\adplug\emuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\fmopl.h">
+    <ClInclude Include="..\..\src\adplug\fmopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\fprovide.h">
+    <ClInclude Include="..\..\src\adplug\fprovide.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\opl.h">
+    <ClInclude Include="..\..\src\adplug\opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\player.h">
+    <ClInclude Include="..\..\src\adplug\player.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\rix.h">
+    <ClInclude Include="..\..\src\adplug\rix.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\surroundopl.h">
+    <ClInclude Include="..\..\src\adplug\surroundopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\adlibemu.h">
+    <ClInclude Include="..\..\src\adplug\adlibemu.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dbemuopl.h">
+    <ClInclude Include="..\..\src\adplug\dbemuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dbopl.h">
+    <ClInclude Include="..\..\src\adplug\dbopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\config_types.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\config_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\ogg.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\ogg.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\os_types.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\os_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\codec.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\codec.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisenc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisenc.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisfile.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisfile.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_51.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_stereo.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_stereo.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\floor\floor_books.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\floor\floor_books.h">
       <Filter>liboggvorbis\src\books\floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
       <Filter>liboggvorbis\src\books\uncoupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\floor_all.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\floor_all.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_11.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44p51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44u.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_11.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_22.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_22.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_32.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_32.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44p51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44u.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_X.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_X.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\backends.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\backends.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\bitrate.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\bitrate.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\codebook.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\codebook.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\codec_internal.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\codec_internal.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\envelope.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\envelope.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\highlevel.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\highlevel.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lookup.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lookup_data.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup_data.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lpc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lpc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lsp.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lsp.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\masking.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\masking.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\mdct.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\mdct.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\misc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\misc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\os.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\os.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\psy.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\psy.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\registry.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\registry.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\scales.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\scales.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\smallft.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\smallft.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\window.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\window.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\bit.h">
+    <ClInclude Include="..\..\src\libmad\bit.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\decoder.h">
+    <ClInclude Include="..\..\src\libmad\decoder.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\fixed.h">
+    <ClInclude Include="..\..\src\libmad\fixed.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\frame.h">
+    <ClInclude Include="..\..\src\libmad\frame.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\huffman.h">
+    <ClInclude Include="..\..\src\libmad\huffman.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\layer3.h">
+    <ClInclude Include="..\..\src\libmad\layer3.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\layer12.h">
+    <ClInclude Include="..\..\src\libmad\layer12.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\libmad_config.h">
+    <ClInclude Include="..\..\src\libmad\libmad_config.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\libmad_global.h">
+    <ClInclude Include="..\..\src\libmad\libmad_global.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\mad.h">
+    <ClInclude Include="..\..\src\libmad\mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\music_mad.h">
+    <ClInclude Include="..\..\src\libmad\music_mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\stream.h">
+    <ClInclude Include="..\..\src\libmad\stream.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\synth.h">
+    <ClInclude Include="..\..\src\libmad\synth.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\timer.h">
+    <ClInclude Include="..\..\src\libmad\timer.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ascii.h">
+    <ClInclude Include="..\..\src\ascii.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\battle.h">
+    <ClInclude Include="..\..\src\battle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\codepage.h">
+    <ClInclude Include="..\..\src\codepage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common.h">
+    <ClInclude Include="..\..\src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ending.h">
+    <ClInclude Include="..\..\src\ending.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\fight.h">
+    <ClInclude Include="..\..\src\fight.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\font.h">
+    <ClInclude Include="..\..\src\font.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\fontglyph.h">
+    <ClInclude Include="..\..\src\fontglyph.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game.h">
+    <ClInclude Include="..\..\src\game.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\global.h">
+    <ClInclude Include="..\..\src\global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\input.h">
+    <ClInclude Include="..\..\src\input.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\itemmenu.h">
+    <ClInclude Include="..\..\src\itemmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\magicmenu.h">
+    <ClInclude Include="..\..\src\magicmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\main.h">
+    <ClInclude Include="..\..\src\main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\map.h">
+    <ClInclude Include="..\..\src\map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palcommon.h">
+    <ClInclude Include="..\..\src\palcommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palette.h">
+    <ClInclude Include="..\..\src\palette.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\play.h">
+    <ClInclude Include="..\..\src\play.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\res.h">
+    <ClInclude Include="..\..\src\res.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\rngplay.h">
+    <ClInclude Include="..\..\src\rngplay.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\scene.h">
+    <ClInclude Include="..\..\src\scene.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\script.h">
+    <ClInclude Include="..\..\src\script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\audio.h">
+    <ClInclude Include="..\..\src\audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\text.h">
+    <ClInclude Include="..\..\src\text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ui.h">
+    <ClInclude Include="..\..\src\ui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\uibattle.h">
+    <ClInclude Include="..\..\src\uibattle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\uigame.h">
+    <ClInclude Include="..\..\src\uigame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\util.h">
+    <ClInclude Include="..\..\src\util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\video.h">
+    <ClInclude Include="..\..\src\video.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\midi.h">
+    <ClInclude Include="..\..\src\midi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\players.h">
+    <ClInclude Include="..\..\src\players.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\resampler.h">
+    <ClInclude Include="..\..\src\resampler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palcfg.h">
+    <ClInclude Include="..\..\src\palcfg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\pal_config.h">
@@ -379,264 +379,264 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\adplug\binfile.cpp">
+    <ClCompile Include="..\..\src\adplug\binfile.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\binio.cpp">
+    <ClCompile Include="..\..\src\adplug\binio.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dosbox_opl.cpp">
+    <ClCompile Include="..\..\src\adplug\dosbox_opl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\emuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\emuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\fmopl.c">
+    <ClCompile Include="..\..\src\adplug\fmopl.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\fprovide.cpp">
+    <ClCompile Include="..\..\src\adplug\fprovide.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\player.cpp">
+    <ClCompile Include="..\..\src\adplug\player.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\rix.cpp">
+    <ClCompile Include="..\..\src\adplug\rix.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\surroundopl.cpp">
+    <ClCompile Include="..\..\src\adplug\surroundopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\adlibemu.c">
+    <ClCompile Include="..\..\src\adplug\adlibemu.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dbemuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\dbemuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dbopl.cpp">
+    <ClCompile Include="..\..\src\adplug\dbopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\demuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\demuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\audio.c">
+    <ClCompile Include="..\..\src\audio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\analysis.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\analysis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\bitrate.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitrate.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\bitwise.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitwise.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\block.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\block.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\codebook.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\codebook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\envelope.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\envelope.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\floor0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\floor1.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor1.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\framing.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\framing.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\info.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\info.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lookup.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lookup.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lpc.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lpc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lsp.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lsp.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\mapping0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\mapping0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\mdct.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\mdct.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\psy.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\psy.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\registry.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\registry.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\res0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\res0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\sharedbook.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\sharedbook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\smallft.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\smallft.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\synthesis.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\synthesis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisenc.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisenc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisfile.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisfile.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\window.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\window.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\bit.c">
+    <ClCompile Include="..\..\src\libmad\bit.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\decoder.c">
+    <ClCompile Include="..\..\src\libmad\decoder.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\fixed.c">
+    <ClCompile Include="..\..\src\libmad\fixed.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\frame.c">
+    <ClCompile Include="..\..\src\libmad\frame.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\huffman.c">
+    <ClCompile Include="..\..\src\libmad\huffman.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\layer3.c">
+    <ClCompile Include="..\..\src\libmad\layer3.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\layer12.c">
+    <ClCompile Include="..\..\src\libmad\layer12.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\music_mad.c">
+    <ClCompile Include="..\..\src\libmad\music_mad.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\stream.c">
+    <ClCompile Include="..\..\src\libmad\stream.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\synth.c">
+    <ClCompile Include="..\..\src\libmad\synth.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\timer.c">
+    <ClCompile Include="..\..\src\libmad\timer.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\battle.c">
+    <ClCompile Include="..\..\src\battle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ending.c">
+    <ClCompile Include="..\..\src\ending.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\fight.c">
+    <ClCompile Include="..\..\src\fight.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\font.c">
+    <ClCompile Include="..\..\src\font.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\game.c">
+    <ClCompile Include="..\..\src\game.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\global.c">
+    <ClCompile Include="..\..\src\global.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\input.c">
+    <ClCompile Include="..\..\src\input.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\itemmenu.c">
+    <ClCompile Include="..\..\src\itemmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\magicmenu.c">
+    <ClCompile Include="..\..\src\magicmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\main.c">
+    <ClCompile Include="..\..\src\main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\map.c">
+    <ClCompile Include="..\..\src\map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palcommon.c">
+    <ClCompile Include="..\..\src\palcommon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palette.c">
+    <ClCompile Include="..\..\src\palette.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\play.c">
+    <ClCompile Include="..\..\src\play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\res.c">
+    <ClCompile Include="..\..\src\res.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\rixplay.cpp">
+    <ClCompile Include="..\..\src\rixplay.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\rngplay.c">
+    <ClCompile Include="..\..\src\rngplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\scene.c">
+    <ClCompile Include="..\..\src\scene.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\script.c">
+    <ClCompile Include="..\..\src\script.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sound.c">
+    <ClCompile Include="..\..\src\sound.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\text.c">
+    <ClCompile Include="..\..\src\text.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ui.c">
+    <ClCompile Include="..\..\src\ui.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\uibattle.c">
+    <ClCompile Include="..\..\src\uibattle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\uigame.c">
+    <ClCompile Include="..\..\src\uigame.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\util.c">
+    <ClCompile Include="..\..\src\util.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\video.c">
+    <ClCompile Include="..\..\src\video.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\yj1.c">
+    <ClCompile Include="..\..\src\yj1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mp3play.c">
+    <ClCompile Include="..\..\src\mp3play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\oggplay.c">
+    <ClCompile Include="..\..\src\oggplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\resampler.c">
+    <ClCompile Include="..\..\src\resampler.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\overlay.c">
+    <ClCompile Include="..\..\src\overlay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palcfg.c">
+    <ClCompile Include="..\..\src\palcfg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\libmad\D.dat">
+    <None Include="..\..\src\libmad\D.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\imdct_s.dat">
+    <None Include="..\..\src\libmad\imdct_s.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\qc_table.dat">
+    <None Include="..\..\src\libmad\qc_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\rq_table.dat">
+    <None Include="..\..\src\libmad\rq_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\sf_table.dat">
+    <None Include="..\..\src\libmad\sf_table.dat">
       <Filter>libmad</Filter>
     </None>
   </ItemGroup>

winrt/SDLPal.WindowsPhone/SDLPal.Core.vcxproj

@@ -85,7 +85,7 @@
     <ClCompile>
       <PreprocessorDefinitions>LONGJMP_EXIT;_CRT_SECURE_NO_WARNINGS;PAL_HAS_PLATFORM_SPECIFIC_UTILS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
@@ -100,7 +100,7 @@
     <ClCompile>
       <PreprocessorDefinitions>LONGJMP_EXIT;_CRT_SECURE_NO_WARNINGS;PAL_HAS_PLATFORM_SPECIFIC_UTILS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
@@ -115,7 +115,7 @@
     <ClCompile>
       <PreprocessorDefinitions>LONGJMP_EXIT;_CRT_SECURE_NO_WARNINGS;PAL_HAS_PLATFORM_SPECIFIC_UTILS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
@@ -130,7 +130,7 @@
     <ClCompile>
       <PreprocessorDefinitions>LONGJMP_EXIT;_CRT_SECURE_NO_WARNINGS;PAL_HAS_PLATFORM_SPECIFIC_UTILS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\;..\..\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\src\liboggvorbis\include;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
@@ -142,199 +142,199 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\adplug\adlibemu.h" />
-    <ClInclude Include="..\..\adplug\binfile.h" />
-    <ClInclude Include="..\..\adplug\binio.h" />
-    <ClInclude Include="..\..\adplug\dbemuopl.h" />
-    <ClInclude Include="..\..\adplug\dbopl.h" />
-    <ClInclude Include="..\..\adplug\demuopl.h" />
-    <ClInclude Include="..\..\adplug\dosbox_opl.h" />
-    <ClInclude Include="..\..\adplug\emuopl.h" />
-    <ClInclude Include="..\..\adplug\fmopl.h" />
-    <ClInclude Include="..\..\adplug\fprovide.h" />
-    <ClInclude Include="..\..\adplug\opl.h" />
-    <ClInclude Include="..\..\adplug\player.h" />
-    <ClInclude Include="..\..\adplug\rix.h" />
-    <ClInclude Include="..\..\adplug\surroundopl.h" />
-    <ClInclude Include="..\..\ascii.h" />
-    <ClInclude Include="..\..\battle.h" />
-    <ClInclude Include="..\..\codepage.h" />
-    <ClInclude Include="..\..\common.h" />
-    <ClInclude Include="..\..\ending.h" />
-    <ClInclude Include="..\..\fight.h" />
-    <ClInclude Include="..\..\font.h" />
-    <ClInclude Include="..\..\fontglyph.h" />
-    <ClInclude Include="..\..\game.h" />
-    <ClInclude Include="..\..\global.h" />
-    <ClInclude Include="..\..\input.h" />
-    <ClInclude Include="..\..\itemmenu.h" />
-    <ClInclude Include="..\..\libmad\bit.h" />
-    <ClInclude Include="..\..\libmad\decoder.h" />
-    <ClInclude Include="..\..\libmad\fixed.h" />
-    <ClInclude Include="..\..\libmad\frame.h" />
-    <ClInclude Include="..\..\libmad\huffman.h" />
-    <ClInclude Include="..\..\libmad\layer12.h" />
-    <ClInclude Include="..\..\libmad\layer3.h" />
-    <ClInclude Include="..\..\libmad\libmad_config.h" />
-    <ClInclude Include="..\..\libmad\libmad_global.h" />
-    <ClInclude Include="..\..\libmad\mad.h" />
-    <ClInclude Include="..\..\libmad\music_mad.h" />
-    <ClInclude Include="..\..\libmad\stream.h" />
-    <ClInclude Include="..\..\libmad\synth.h" />
-    <ClInclude Include="..\..\libmad\timer.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\config_types.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\ogg.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\os_types.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\codec.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisenc.h" />
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisfile.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\backends.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\bitrate.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_stereo.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\floor\floor_books.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\codebook.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\codec_internal.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\envelope.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\highlevel.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lookup.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lookup_data.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lpc.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\lsp.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\masking.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\mdct.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\misc.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\floor_all.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_11.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44p51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44u.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_11.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_16.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_22.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_32.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44p51.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44u.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_8.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_X.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\os.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\psy.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\registry.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\scales.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\smallft.h" />
-    <ClInclude Include="..\..\liboggvorbis\src\window.h" />
-    <ClInclude Include="..\..\magicmenu.h" />
-    <ClInclude Include="..\..\main.h" />
-    <ClInclude Include="..\..\map.h" />
-    <ClInclude Include="..\..\midi.h" />
-    <ClInclude Include="..\..\palcfg.h" />
-    <ClInclude Include="..\..\palcommon.h" />
-    <ClInclude Include="..\..\palette.h" />
-    <ClInclude Include="..\..\play.h" />
-    <ClInclude Include="..\..\players.h" />
-    <ClInclude Include="..\..\res.h" />
-    <ClInclude Include="..\..\resampler.h" />
-    <ClInclude Include="..\..\rngplay.h" />
-    <ClInclude Include="..\..\scene.h" />
-    <ClInclude Include="..\..\script.h" />
-    <ClInclude Include="..\..\audio.h" />
-    <ClInclude Include="..\..\text.h" />
-    <ClInclude Include="..\..\ui.h" />
-    <ClInclude Include="..\..\uibattle.h" />
-    <ClInclude Include="..\..\uigame.h" />
-    <ClInclude Include="..\..\util.h" />
-    <ClInclude Include="..\..\video.h" />
+    <ClInclude Include="..\..\src\adplug\adlibemu.h" />
+    <ClInclude Include="..\..\src\adplug\binfile.h" />
+    <ClInclude Include="..\..\src\adplug\binio.h" />
+    <ClInclude Include="..\..\src\adplug\dbemuopl.h" />
+    <ClInclude Include="..\..\src\adplug\dbopl.h" />
+    <ClInclude Include="..\..\src\adplug\demuopl.h" />
+    <ClInclude Include="..\..\src\adplug\dosbox_opl.h" />
+    <ClInclude Include="..\..\src\adplug\emuopl.h" />
+    <ClInclude Include="..\..\src\adplug\fmopl.h" />
+    <ClInclude Include="..\..\src\adplug\fprovide.h" />
+    <ClInclude Include="..\..\src\adplug\opl.h" />
+    <ClInclude Include="..\..\src\adplug\player.h" />
+    <ClInclude Include="..\..\src\adplug\rix.h" />
+    <ClInclude Include="..\..\src\adplug\surroundopl.h" />
+    <ClInclude Include="..\..\src\ascii.h" />
+    <ClInclude Include="..\..\src\battle.h" />
+    <ClInclude Include="..\..\src\codepage.h" />
+    <ClInclude Include="..\..\src\common.h" />
+    <ClInclude Include="..\..\src\ending.h" />
+    <ClInclude Include="..\..\src\fight.h" />
+    <ClInclude Include="..\..\src\font.h" />
+    <ClInclude Include="..\..\src\fontglyph.h" />
+    <ClInclude Include="..\..\src\game.h" />
+    <ClInclude Include="..\..\src\global.h" />
+    <ClInclude Include="..\..\src\input.h" />
+    <ClInclude Include="..\..\src\itemmenu.h" />
+    <ClInclude Include="..\..\src\libmad\bit.h" />
+    <ClInclude Include="..\..\src\libmad\decoder.h" />
+    <ClInclude Include="..\..\src\libmad\fixed.h" />
+    <ClInclude Include="..\..\src\libmad\frame.h" />
+    <ClInclude Include="..\..\src\libmad\huffman.h" />
+    <ClInclude Include="..\..\src\libmad\layer12.h" />
+    <ClInclude Include="..\..\src\libmad\layer3.h" />
+    <ClInclude Include="..\..\src\libmad\libmad_config.h" />
+    <ClInclude Include="..\..\src\libmad\libmad_global.h" />
+    <ClInclude Include="..\..\src\libmad\mad.h" />
+    <ClInclude Include="..\..\src\libmad\music_mad.h" />
+    <ClInclude Include="..\..\src\libmad\stream.h" />
+    <ClInclude Include="..\..\src\libmad\synth.h" />
+    <ClInclude Include="..\..\src\libmad\timer.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\config_types.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\ogg.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\os_types.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\codec.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisenc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisfile.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\backends.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\bitrate.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_stereo.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\floor\floor_books.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\codebook.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\codec_internal.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\envelope.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\highlevel.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup_data.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lpc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\lsp.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\masking.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\mdct.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\misc.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\floor_all.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_11.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44p51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44u.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_11.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_16.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_22.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_32.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44p51.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44u.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_8.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_X.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\os.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\psy.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\registry.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\scales.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\smallft.h" />
+    <ClInclude Include="..\..\src\liboggvorbis\src\window.h" />
+    <ClInclude Include="..\..\src\magicmenu.h" />
+    <ClInclude Include="..\..\src\main.h" />
+    <ClInclude Include="..\..\src\map.h" />
+    <ClInclude Include="..\..\src\midi.h" />
+    <ClInclude Include="..\..\src\palcfg.h" />
+    <ClInclude Include="..\..\src\palcommon.h" />
+    <ClInclude Include="..\..\src\palette.h" />
+    <ClInclude Include="..\..\src\play.h" />
+    <ClInclude Include="..\..\src\players.h" />
+    <ClInclude Include="..\..\src\res.h" />
+    <ClInclude Include="..\..\src\resampler.h" />
+    <ClInclude Include="..\..\src\rngplay.h" />
+    <ClInclude Include="..\..\src\scene.h" />
+    <ClInclude Include="..\..\src\script.h" />
+    <ClInclude Include="..\..\src\audio.h" />
+    <ClInclude Include="..\..\src\text.h" />
+    <ClInclude Include="..\..\src\ui.h" />
+    <ClInclude Include="..\..\src\uibattle.h" />
+    <ClInclude Include="..\..\src\uigame.h" />
+    <ClInclude Include="..\..\src\util.h" />
+    <ClInclude Include="..\..\src\video.h" />
     <ClInclude Include="..\pal_config.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\adplug\adlibemu.c" />
-    <ClCompile Include="..\..\adplug\binfile.cpp" />
-    <ClCompile Include="..\..\adplug\binio.cpp" />
-    <ClCompile Include="..\..\adplug\dbemuopl.cpp" />
-    <ClCompile Include="..\..\adplug\dbopl.cpp" />
-    <ClCompile Include="..\..\adplug\demuopl.cpp" />
-    <ClCompile Include="..\..\adplug\dosbox_opl.cpp" />
-    <ClCompile Include="..\..\adplug\emuopl.cpp" />
-    <ClCompile Include="..\..\adplug\fmopl.c" />
-    <ClCompile Include="..\..\adplug\fprovide.cpp" />
-    <ClCompile Include="..\..\adplug\player.cpp" />
-    <ClCompile Include="..\..\adplug\rix.cpp" />
-    <ClCompile Include="..\..\adplug\surroundopl.cpp" />
-    <ClCompile Include="..\..\audio.c" />
-    <ClCompile Include="..\..\battle.c" />
-    <ClCompile Include="..\..\ending.c" />
-    <ClCompile Include="..\..\fight.c" />
-    <ClCompile Include="..\..\font.c" />
-    <ClCompile Include="..\..\game.c" />
-    <ClCompile Include="..\..\global.c" />
-    <ClCompile Include="..\..\input.c" />
-    <ClCompile Include="..\..\itemmenu.c" />
-    <ClCompile Include="..\..\libmad\bit.c" />
-    <ClCompile Include="..\..\libmad\decoder.c" />
-    <ClCompile Include="..\..\libmad\fixed.c" />
-    <ClCompile Include="..\..\libmad\frame.c" />
-    <ClCompile Include="..\..\libmad\huffman.c" />
-    <ClCompile Include="..\..\libmad\layer12.c" />
-    <ClCompile Include="..\..\libmad\layer3.c" />
-    <ClCompile Include="..\..\libmad\music_mad.c" />
-    <ClCompile Include="..\..\libmad\stream.c" />
-    <ClCompile Include="..\..\libmad\synth.c" />
-    <ClCompile Include="..\..\libmad\timer.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\analysis.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\bitrate.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\bitwise.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\block.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\codebook.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\envelope.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\floor0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\floor1.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\framing.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\info.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lookup.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lpc.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\lsp.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\mapping0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\mdct.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\psy.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\registry.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\res0.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\sharedbook.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\smallft.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\synthesis.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisenc.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisfile.c" />
-    <ClCompile Include="..\..\liboggvorbis\src\window.c" />
-    <ClCompile Include="..\..\magicmenu.c" />
-    <ClCompile Include="..\..\main.c" />
-    <ClCompile Include="..\..\map.c" />
-    <ClCompile Include="..\..\mp3play.c" />
-    <ClCompile Include="..\..\oggplay.c" />
-    <ClCompile Include="..\..\overlay.c" />
-    <ClCompile Include="..\..\palcfg.c" />
-    <ClCompile Include="..\..\palcommon.c" />
-    <ClCompile Include="..\..\palette.c" />
-    <ClCompile Include="..\..\play.c" />
-    <ClCompile Include="..\..\res.c" />
-    <ClCompile Include="..\..\resampler.c" />
-    <ClCompile Include="..\..\rixplay.cpp" />
-    <ClCompile Include="..\..\rngplay.c" />
-    <ClCompile Include="..\..\scene.c" />
-    <ClCompile Include="..\..\script.c" />
-    <ClCompile Include="..\..\sound.c" />
-    <ClCompile Include="..\..\text.c" />
-    <ClCompile Include="..\..\ui.c" />
-    <ClCompile Include="..\..\uibattle.c" />
-    <ClCompile Include="..\..\uigame.c" />
-    <ClCompile Include="..\..\util.c" />
-    <ClCompile Include="..\..\video.c" />
-    <ClCompile Include="..\..\yj1.c" />
+    <ClCompile Include="..\..\src\adplug\adlibemu.c" />
+    <ClCompile Include="..\..\src\adplug\binfile.cpp" />
+    <ClCompile Include="..\..\src\adplug\binio.cpp" />
+    <ClCompile Include="..\..\src\adplug\dbemuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\dbopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\demuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\dosbox_opl.cpp" />
+    <ClCompile Include="..\..\src\adplug\emuopl.cpp" />
+    <ClCompile Include="..\..\src\adplug\fmopl.c" />
+    <ClCompile Include="..\..\src\adplug\fprovide.cpp" />
+    <ClCompile Include="..\..\src\adplug\player.cpp" />
+    <ClCompile Include="..\..\src\adplug\rix.cpp" />
+    <ClCompile Include="..\..\src\adplug\surroundopl.cpp" />
+    <ClCompile Include="..\..\src\audio.c" />
+    <ClCompile Include="..\..\src\battle.c" />
+    <ClCompile Include="..\..\src\ending.c" />
+    <ClCompile Include="..\..\src\fight.c" />
+    <ClCompile Include="..\..\src\font.c" />
+    <ClCompile Include="..\..\src\game.c" />
+    <ClCompile Include="..\..\src\global.c" />
+    <ClCompile Include="..\..\src\input.c" />
+    <ClCompile Include="..\..\src\itemmenu.c" />
+    <ClCompile Include="..\..\src\libmad\bit.c" />
+    <ClCompile Include="..\..\src\libmad\decoder.c" />
+    <ClCompile Include="..\..\src\libmad\fixed.c" />
+    <ClCompile Include="..\..\src\libmad\frame.c" />
+    <ClCompile Include="..\..\src\libmad\huffman.c" />
+    <ClCompile Include="..\..\src\libmad\layer12.c" />
+    <ClCompile Include="..\..\src\libmad\layer3.c" />
+    <ClCompile Include="..\..\src\libmad\music_mad.c" />
+    <ClCompile Include="..\..\src\libmad\stream.c" />
+    <ClCompile Include="..\..\src\libmad\synth.c" />
+    <ClCompile Include="..\..\src\libmad\timer.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\analysis.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitrate.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitwise.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\block.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\codebook.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\envelope.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor1.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\framing.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\info.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lookup.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lpc.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\lsp.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\mapping0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\mdct.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\psy.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\registry.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\res0.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\sharedbook.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\smallft.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\synthesis.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisenc.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisfile.c" />
+    <ClCompile Include="..\..\src\liboggvorbis\src\window.c" />
+    <ClCompile Include="..\..\src\magicmenu.c" />
+    <ClCompile Include="..\..\src\main.c" />
+    <ClCompile Include="..\..\src\map.c" />
+    <ClCompile Include="..\..\src\mp3play.c" />
+    <ClCompile Include="..\..\src\oggplay.c" />
+    <ClCompile Include="..\..\src\overlay.c" />
+    <ClCompile Include="..\..\src\palcfg.c" />
+    <ClCompile Include="..\..\src\palcommon.c" />
+    <ClCompile Include="..\..\src\palette.c" />
+    <ClCompile Include="..\..\src\play.c" />
+    <ClCompile Include="..\..\src\res.c" />
+    <ClCompile Include="..\..\src\resampler.c" />
+    <ClCompile Include="..\..\src\rixplay.cpp" />
+    <ClCompile Include="..\..\src\rngplay.c" />
+    <ClCompile Include="..\..\src\scene.c" />
+    <ClCompile Include="..\..\src\script.c" />
+    <ClCompile Include="..\..\src\sound.c" />
+    <ClCompile Include="..\..\src\text.c" />
+    <ClCompile Include="..\..\src\ui.c" />
+    <ClCompile Include="..\..\src\uibattle.c" />
+    <ClCompile Include="..\..\src\uigame.c" />
+    <ClCompile Include="..\..\src\util.c" />
+    <ClCompile Include="..\..\src\video.c" />
+    <ClCompile Include="..\..\src\yj1.c" />
   </ItemGroup>
   <ItemGroup>
     <_CustomResource Include="Assets\Data\**\*">
@@ -343,11 +343,11 @@
     </_CustomResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\libmad\D.dat" />
-    <None Include="..\libmad\imdct_s.dat" />
-    <None Include="..\libmad\qc_table.dat" />
-    <None Include="..\libmad\rq_table.dat" />
-    <None Include="..\libmad\sf_table.dat" />
+    <None Include="..\..\src\libmad\D.dat" />
+    <None Include="..\..\src\libmad\imdct_s.dat" />
+    <None Include="..\..\src\libmad\qc_table.dat" />
+    <None Include="..\..\src\libmad\rq_table.dat" />
+    <None Include="..\..\src\libmad\sf_table.dat" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

winrt/SDLPal.WindowsPhone/SDLPal.Core.vcxproj.filters

@@ -47,331 +47,331 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\adplug\binfile.h">
+    <ClInclude Include="..\..\src\adplug\binfile.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\binio.h">
+    <ClInclude Include="..\..\src\adplug\binio.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\demuopl.h">
+    <ClInclude Include="..\..\src\adplug\demuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dosbox_opl.h">
+    <ClInclude Include="..\..\src\adplug\dosbox_opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\emuopl.h">
+    <ClInclude Include="..\..\src\adplug\emuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\fmopl.h">
+    <ClInclude Include="..\..\src\adplug\fmopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\fprovide.h">
+    <ClInclude Include="..\..\src\adplug\fprovide.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\opl.h">
+    <ClInclude Include="..\..\src\adplug\opl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\player.h">
+    <ClInclude Include="..\..\src\adplug\player.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\rix.h">
+    <ClInclude Include="..\..\src\adplug\rix.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\surroundopl.h">
+    <ClInclude Include="..\..\src\adplug\surroundopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\adlibemu.h">
+    <ClInclude Include="..\..\src\adplug\adlibemu.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dbemuopl.h">
+    <ClInclude Include="..\..\src\adplug\dbemuopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\adplug\dbopl.h">
+    <ClInclude Include="..\..\src\adplug\dbopl.h">
       <Filter>adplug</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\config_types.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\config_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\ogg.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\ogg.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\ogg\os_types.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\ogg\os_types.h">
       <Filter>liboggvorbis\include\ogg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\codec.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\codec.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisenc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisenc.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\include\vorbis\vorbisfile.h">
+    <ClInclude Include="..\..\src\liboggvorbis\include\vorbis\vorbisfile.h">
       <Filter>liboggvorbis\include\vorbis</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_51.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\coupled\res_books_stereo.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\coupled\res_books_stereo.h">
       <Filter>liboggvorbis\src\books\coupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\floor\floor_books.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\floor\floor_books.h">
       <Filter>liboggvorbis\src\books\floor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\books\uncoupled\res_books_uncoupled.h">
       <Filter>liboggvorbis\src\books\uncoupled</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\floor_all.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\floor_all.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_11.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\psych_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\psych_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44p51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\residue_44u.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\residue_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_8.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_8.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_11.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_11.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_16.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_16.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_22.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_22.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_32.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_32.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44p51.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44p51.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_44u.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_44u.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\modes\setup_X.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\modes\setup_X.h">
       <Filter>liboggvorbis\src\modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\backends.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\backends.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\bitrate.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\bitrate.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\codebook.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\codebook.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\codec_internal.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\codec_internal.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\envelope.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\envelope.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\highlevel.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\highlevel.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lookup.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lookup_data.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lookup_data.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lpc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lpc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\lsp.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\lsp.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\masking.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\masking.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\mdct.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\mdct.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\misc.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\misc.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\os.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\os.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\psy.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\psy.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\registry.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\registry.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\scales.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\scales.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\smallft.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\smallft.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\liboggvorbis\src\window.h">
+    <ClInclude Include="..\..\src\liboggvorbis\src\window.h">
       <Filter>liboggvorbis\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\bit.h">
+    <ClInclude Include="..\..\src\libmad\bit.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\decoder.h">
+    <ClInclude Include="..\..\src\libmad\decoder.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\fixed.h">
+    <ClInclude Include="..\..\src\libmad\fixed.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\frame.h">
+    <ClInclude Include="..\..\src\libmad\frame.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\huffman.h">
+    <ClInclude Include="..\..\src\libmad\huffman.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\layer3.h">
+    <ClInclude Include="..\..\src\libmad\layer3.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\layer12.h">
+    <ClInclude Include="..\..\src\libmad\layer12.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\libmad_config.h">
+    <ClInclude Include="..\..\src\libmad\libmad_config.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\libmad_global.h">
+    <ClInclude Include="..\..\src\libmad\libmad_global.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\mad.h">
+    <ClInclude Include="..\..\src\libmad\mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\music_mad.h">
+    <ClInclude Include="..\..\src\libmad\music_mad.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\stream.h">
+    <ClInclude Include="..\..\src\libmad\stream.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\synth.h">
+    <ClInclude Include="..\..\src\libmad\synth.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libmad\timer.h">
+    <ClInclude Include="..\..\src\libmad\timer.h">
       <Filter>libmad</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ascii.h">
+    <ClInclude Include="..\..\src\ascii.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\battle.h">
+    <ClInclude Include="..\..\src\battle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\codepage.h">
+    <ClInclude Include="..\..\src\codepage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common.h">
+    <ClInclude Include="..\..\src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ending.h">
+    <ClInclude Include="..\..\src\ending.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\fight.h">
+    <ClInclude Include="..\..\src\fight.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\font.h">
+    <ClInclude Include="..\..\src\font.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\fontglyph.h">
+    <ClInclude Include="..\..\src\fontglyph.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game.h">
+    <ClInclude Include="..\..\src\game.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\global.h">
+    <ClInclude Include="..\..\src\global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\input.h">
+    <ClInclude Include="..\..\src\input.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\itemmenu.h">
+    <ClInclude Include="..\..\src\itemmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\magicmenu.h">
+    <ClInclude Include="..\..\src\magicmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\main.h">
+    <ClInclude Include="..\..\src\main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\map.h">
+    <ClInclude Include="..\..\src\map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palcommon.h">
+    <ClInclude Include="..\..\src\palcommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palette.h">
+    <ClInclude Include="..\..\src\palette.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\play.h">
+    <ClInclude Include="..\..\src\play.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\res.h">
+    <ClInclude Include="..\..\src\res.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\rngplay.h">
+    <ClInclude Include="..\..\src\rngplay.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\scene.h">
+    <ClInclude Include="..\..\src\scene.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\script.h">
+    <ClInclude Include="..\..\src\script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\audio.h">
+    <ClInclude Include="..\..\src\audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\text.h">
+    <ClInclude Include="..\..\src\text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ui.h">
+    <ClInclude Include="..\..\src\ui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\uibattle.h">
+    <ClInclude Include="..\..\src\uibattle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\uigame.h">
+    <ClInclude Include="..\..\src\uigame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\util.h">
+    <ClInclude Include="..\..\src\util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\video.h">
+    <ClInclude Include="..\..\src\video.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\midi.h">
+    <ClInclude Include="..\..\src\midi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\players.h">
+    <ClInclude Include="..\..\src\players.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\resampler.h">
+    <ClInclude Include="..\..\src\resampler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\palcfg.h">
+    <ClInclude Include="..\..\src\palcfg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\pal_config.h">
@@ -379,264 +379,264 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\adplug\binfile.cpp">
+    <ClCompile Include="..\..\src\adplug\binfile.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\binio.cpp">
+    <ClCompile Include="..\..\src\adplug\binio.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dosbox_opl.cpp">
+    <ClCompile Include="..\..\src\adplug\dosbox_opl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\emuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\emuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\fmopl.c">
+    <ClCompile Include="..\..\src\adplug\fmopl.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\fprovide.cpp">
+    <ClCompile Include="..\..\src\adplug\fprovide.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\player.cpp">
+    <ClCompile Include="..\..\src\adplug\player.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\rix.cpp">
+    <ClCompile Include="..\..\src\adplug\rix.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\surroundopl.cpp">
+    <ClCompile Include="..\..\src\adplug\surroundopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\adlibemu.c">
+    <ClCompile Include="..\..\src\adplug\adlibemu.c">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dbemuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\dbemuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\dbopl.cpp">
+    <ClCompile Include="..\..\src\adplug\dbopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\adplug\demuopl.cpp">
+    <ClCompile Include="..\..\src\adplug\demuopl.cpp">
       <Filter>adplug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\audio.c">
+    <ClCompile Include="..\..\src\audio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\analysis.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\analysis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\bitrate.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitrate.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\bitwise.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\bitwise.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\block.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\block.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\codebook.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\codebook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\envelope.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\envelope.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\floor0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\floor1.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\floor1.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\framing.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\framing.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\info.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\info.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lookup.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lookup.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lpc.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lpc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\lsp.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\lsp.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\mapping0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\mapping0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\mdct.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\mdct.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\psy.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\psy.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\registry.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\registry.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\res0.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\res0.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\sharedbook.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\sharedbook.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\smallft.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\smallft.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\synthesis.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\synthesis.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisenc.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisenc.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\vorbisfile.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\vorbisfile.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\liboggvorbis\src\window.c">
+    <ClCompile Include="..\..\src\liboggvorbis\src\window.c">
       <Filter>liboggvorbis\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\bit.c">
+    <ClCompile Include="..\..\src\libmad\bit.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\decoder.c">
+    <ClCompile Include="..\..\src\libmad\decoder.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\fixed.c">
+    <ClCompile Include="..\..\src\libmad\fixed.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\frame.c">
+    <ClCompile Include="..\..\src\libmad\frame.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\huffman.c">
+    <ClCompile Include="..\..\src\libmad\huffman.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\layer3.c">
+    <ClCompile Include="..\..\src\libmad\layer3.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\layer12.c">
+    <ClCompile Include="..\..\src\libmad\layer12.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\music_mad.c">
+    <ClCompile Include="..\..\src\libmad\music_mad.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\stream.c">
+    <ClCompile Include="..\..\src\libmad\stream.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\synth.c">
+    <ClCompile Include="..\..\src\libmad\synth.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libmad\timer.c">
+    <ClCompile Include="..\..\src\libmad\timer.c">
       <Filter>libmad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\battle.c">
+    <ClCompile Include="..\..\src\battle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ending.c">
+    <ClCompile Include="..\..\src\ending.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\fight.c">
+    <ClCompile Include="..\..\src\fight.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\font.c">
+    <ClCompile Include="..\..\src\font.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\game.c">
+    <ClCompile Include="..\..\src\game.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\global.c">
+    <ClCompile Include="..\..\src\global.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\input.c">
+    <ClCompile Include="..\..\src\input.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\itemmenu.c">
+    <ClCompile Include="..\..\src\itemmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\magicmenu.c">
+    <ClCompile Include="..\..\src\magicmenu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\main.c">
+    <ClCompile Include="..\..\src\main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\map.c">
+    <ClCompile Include="..\..\src\map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palcommon.c">
+    <ClCompile Include="..\..\src\palcommon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palette.c">
+    <ClCompile Include="..\..\src\palette.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\play.c">
+    <ClCompile Include="..\..\src\play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\res.c">
+    <ClCompile Include="..\..\src\res.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\rixplay.cpp">
+    <ClCompile Include="..\..\src\rixplay.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\rngplay.c">
+    <ClCompile Include="..\..\src\rngplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\scene.c">
+    <ClCompile Include="..\..\src\scene.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\script.c">
+    <ClCompile Include="..\..\src\script.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sound.c">
+    <ClCompile Include="..\..\src\sound.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\text.c">
+    <ClCompile Include="..\..\src\text.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ui.c">
+    <ClCompile Include="..\..\src\ui.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\uibattle.c">
+    <ClCompile Include="..\..\src\uibattle.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\uigame.c">
+    <ClCompile Include="..\..\src\uigame.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\util.c">
+    <ClCompile Include="..\..\src\util.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\video.c">
+    <ClCompile Include="..\..\src\video.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\yj1.c">
+    <ClCompile Include="..\..\src\yj1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mp3play.c">
+    <ClCompile Include="..\..\src\mp3play.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\oggplay.c">
+    <ClCompile Include="..\..\src\oggplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\resampler.c">
+    <ClCompile Include="..\..\src\resampler.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\overlay.c">
+    <ClCompile Include="..\..\src\overlay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\palcfg.c">
+    <ClCompile Include="..\..\src\palcfg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\libmad\D.dat">
+    <None Include="..\..\src\libmad\D.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\imdct_s.dat">
+    <None Include="..\..\src\libmad\imdct_s.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\qc_table.dat">
+    <None Include="..\..\src\libmad\qc_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\rq_table.dat">
+    <None Include="..\..\src\libmad\rq_table.dat">
       <Filter>libmad</Filter>
     </None>
-    <None Include="..\libmad\sf_table.dat">
+    <None Include="..\..\src\libmad\sf_table.dat">
       <Filter>libmad</Filter>
     </None>
   </ItemGroup>