diff --git a/shell/linux/Makefile b/shell/linux/Makefile
index b445f89e0..b5e042ab6 100644
--- a/shell/linux/Makefile
+++ b/shell/linux/Makefile
@@ -237,7 +237,7 @@ else ifneq (,$(findstring vero4k,$(platform)))
 else ifneq (,$(findstring win32,$(platform)))
     X64_REC := 1
     NOT_ARM := 1
-    CFLAGS += -DTARGET_NO_WEBUI -fno-builtin-sqrtf -funroll-loops
+    CFLAGS += -DTARGET_NO_WEBUI -fno-builtin-sqrtf -funroll-loops -DHAVE_FSEEKO
     LDFLAGS += -static-libgcc -static-libstdc++
     LIBS := -lopengl32 -lwinmm -lgdi32 -lwsock32 -ldsound -lcomctl32 -lcomdlg32 -lxinput -liphlpapi
     PLATFORM_EXT := exe
diff --git a/shell/reicast.vcxproj b/shell/reicast.vcxproj
index 0cdeb4d4d..6a8ec8b4c 100644
--- a/shell/reicast.vcxproj
+++ b/shell/reicast.vcxproj
@@ -39,10 +39,35 @@
     <ClCompile Include="..\core\cfg\cfg.cpp" />
     <ClCompile Include="..\core\cfg\ini.cpp" />
     <ClCompile Include="..\core\deps\chdpsr\cdipsr.cpp" />
-    <ClCompile Include="..\core\deps\chdr\chdr.cpp" />
+    <ClCompile Include="..\core\deps\chdr\bitstream.c" />
+    <ClCompile Include="..\core\deps\chdr\cdrom.c" />
+    <ClCompile Include="..\core\deps\chdr\chd.c" />
+    <ClCompile Include="..\core\deps\chdr\flac.c" />
+    <ClCompile Include="..\core\deps\chdr\huffman.c" />
     <ClCompile Include="..\core\deps\coreio\coreio.cpp" />
     <ClCompile Include="..\core\deps\crypto\md5.cpp" />
     <ClCompile Include="..\core\deps\crypto\sha1.cpp" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\bitmath.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\bitreader.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\cpu.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\crc.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\fixed.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\fixed_intrin_sse2.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\fixed_intrin_ssse3.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\float.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\format.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_avx2.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_sse.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_sse2.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_sse41.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\md5.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\memory.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\metadata_iterators.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\metadata_object.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\stream_decoder.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\window.c" />
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\windows_unicode_filenames.c" />
     <ClCompile Include="..\core\deps\libelf\elf.cpp" />
     <ClCompile Include="..\core\deps\libelf\elf32.cpp" />
     <ClCompile Include="..\core\deps\libelf\elf64.cpp" />
@@ -80,6 +105,19 @@
     <ClCompile Include="..\core\deps\libwebsocket\server.c" />
     <ClCompile Include="..\core\deps\libwebsocket\service.c" />
     <ClCompile Include="..\core\deps\libwebsocket\sha-1.c" />
+    <ClCompile Include="..\core\deps\lzma\Alloc.c" />
+    <ClCompile Include="..\core\deps\lzma\Bra.c" />
+    <ClCompile Include="..\core\deps\lzma\Bra86.c" />
+    <ClCompile Include="..\core\deps\lzma\BraIA64.c" />
+    <ClCompile Include="..\core\deps\lzma\CpuArch.c" />
+    <ClCompile Include="..\core\deps\lzma\Delta.c" />
+    <ClCompile Include="..\core\deps\lzma\LzFind.c" />
+    <ClCompile Include="..\core\deps\lzma\Lzma86Dec.c" />
+    <ClCompile Include="..\core\deps\lzma\Lzma86Enc.c" />
+    <ClCompile Include="..\core\deps\lzma\LzmaDec.c" />
+    <ClCompile Include="..\core\deps\lzma\LzmaEnc.c" />
+    <ClCompile Include="..\core\deps\lzma\LzmaLib.c" />
+    <ClCompile Include="..\core\deps\lzma\Sort.c" />
     <ClCompile Include="..\core\deps\xbrz\xbrz.cpp" />
     <ClCompile Include="..\core\deps\xxhash\xxhash.c" />
     <ClCompile Include="..\core\deps\zlib\adler32.c" />
@@ -250,11 +288,31 @@
     <ClInclude Include="..\core\cfg\cfg.h" />
     <ClInclude Include="..\core\cfg\ini.h" />
     <ClInclude Include="..\core\deps\chdpsr\cdipsr.h" />
+    <ClInclude Include="..\core\deps\chdr\bitstream.h" />
+    <ClInclude Include="..\core\deps\chdr\cdrom.h" />
     <ClInclude Include="..\core\deps\chdr\chd.h" />
     <ClInclude Include="..\core\deps\chdr\coretypes.h" />
+    <ClInclude Include="..\core\deps\chdr\flac.h" />
+    <ClInclude Include="..\core\deps\chdr\huffman.h" />
     <ClInclude Include="..\core\deps\coreio\coreio.h" />
     <ClInclude Include="..\core\deps\crypto\md5.h" />
     <ClInclude Include="..\core\deps\crypto\sha1.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\all.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\assert.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\callback.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\export.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\format.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\metadata.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\ordinals.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\stream_decoder.h" />
+    <ClInclude Include="..\core\deps\flac\include\FLAC\stream_encoder.h" />
+    <ClInclude Include="..\core\deps\flac\include\share\alloc.h" />
+    <ClInclude Include="..\core\deps\flac\include\share\compat.h" />
+    <ClInclude Include="..\core\deps\flac\include\share\endswap.h" />
+    <ClInclude Include="..\core\deps\flac\include\share\macros.h" />
+    <ClInclude Include="..\core\deps\flac\include\share\safe_str.h" />
+    <ClInclude Include="..\core\deps\flac\include\share\windows_unicode_filenames.h" />
+    <ClInclude Include="..\core\deps\flac\include\share\win_utf8_io.h" />
     <ClInclude Include="..\core\deps\libelf\debug.h" />
     <ClInclude Include="..\core\deps\libelf\elf.h" />
     <ClInclude Include="..\core\deps\libelf\elf32.h" />
@@ -268,6 +326,20 @@
     <ClInclude Include="..\core\deps\libwebsocket\libwebsockets.h" />
     <ClInclude Include="..\core\deps\libwebsocket\lws_config.h" />
     <ClInclude Include="..\core\deps\libwebsocket\private-libwebsockets.h" />
+    <ClInclude Include="..\core\deps\lzma\7zTypes.h" />
+    <ClInclude Include="..\core\deps\lzma\Alloc.h" />
+    <ClInclude Include="..\core\deps\lzma\Bra.h" />
+    <ClInclude Include="..\core\deps\lzma\Compiler.h" />
+    <ClInclude Include="..\core\deps\lzma\CpuArch.h" />
+    <ClInclude Include="..\core\deps\lzma\Delta.h" />
+    <ClInclude Include="..\core\deps\lzma\LzFind.h" />
+    <ClInclude Include="..\core\deps\lzma\LzHash.h" />
+    <ClInclude Include="..\core\deps\lzma\Lzma86.h" />
+    <ClInclude Include="..\core\deps\lzma\LzmaDec.h" />
+    <ClInclude Include="..\core\deps\lzma\LzmaEnc.h" />
+    <ClInclude Include="..\core\deps\lzma\LzmaLib.h" />
+    <ClInclude Include="..\core\deps\lzma\Precomp.h" />
+    <ClInclude Include="..\core\deps\lzma\Sort.h" />
     <ClInclude Include="..\core\deps\zlib\crc32.h" />
     <ClInclude Include="..\core\deps\zlib\deflate.h" />
     <ClInclude Include="..\core\deps\zlib\inffast.h" />
@@ -567,8 +639,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -599,8 +671,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;RELEASE;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -631,8 +703,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -665,8 +737,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;RELEASE;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -699,8 +771,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -720,8 +792,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;X86;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -741,8 +813,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -765,8 +837,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;X86;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
diff --git a/shell/reicast.vcxproj.filters b/shell/reicast.vcxproj.filters
index b983022f6..6c854badf 100644
--- a/shell/reicast.vcxproj.filters
+++ b/shell/reicast.vcxproj.filters
@@ -97,9 +97,6 @@
     <ClCompile Include="..\core\deps\crypto\sha1.cpp">
       <Filter>deps\crypto</Filter>
     </ClCompile>
-    <ClCompile Include="..\core\deps\chdr\chdr.cpp">
-      <Filter>deps\chdr</Filter>
-    </ClCompile>
     <ClCompile Include="..\core\imgread\cdi.cpp">
       <Filter>imgread</Filter>
     </ClCompile>
@@ -454,6 +451,123 @@
     <ClCompile Include="..\core\hw\pvr\ta.cpp">
       <Filter>hw\pvr</Filter>
     </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\Alloc.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\Bra.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\Bra86.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\BraIA64.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\CpuArch.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\Delta.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\LzFind.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\Lzma86Dec.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\Lzma86Enc.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\LzmaDec.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\LzmaEnc.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\LzmaLib.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\lzma\Sort.c">
+      <Filter>deps\lzma</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\bitmath.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\bitreader.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\cpu.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\crc.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\fixed.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\fixed_intrin_sse2.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\fixed_intrin_ssse3.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\float.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\format.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_avx2.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_sse.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_sse2.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\lpc_intrin_sse41.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\md5.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\memory.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\metadata_iterators.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\metadata_object.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\stream_decoder.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\window.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\flac\src\libFLAC\windows_unicode_filenames.c">
+      <Filter>deps\flac\src\libFLAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\chdr\bitstream.c">
+      <Filter>deps\chdr</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\chdr\cdrom.c">
+      <Filter>deps\chdr</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\chdr\chd.c">
+      <Filter>deps\chdr</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\chdr\flac.c">
+      <Filter>deps\chdr</Filter>
+    </ClCompile>
+    <ClCompile Include="..\core\deps\chdr\huffman.c">
+      <Filter>deps\chdr</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="hw">
@@ -588,6 +702,27 @@
     <Filter Include="hw\modem">
       <UniqueIdentifier>{a67aece4-e47f-48a2-8944-6afbe679a5fb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="deps\lzma">
+      <UniqueIdentifier>{4c0328b2-a9b3-4b0a-ab54-558ba960b03a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps\flac">
+      <UniqueIdentifier>{8bb0b4a0-7661-4533-9245-fc43582f6182}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps\flac\include">
+      <UniqueIdentifier>{98226656-1e2d-4d69-bcd4-c1c1b6d4cb0a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps\flac\src">
+      <UniqueIdentifier>{f06382df-ae0e-459c-92a2-dc0eaab25b05}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps\flac\include\FLAC">
+      <UniqueIdentifier>{39e82b10-530a-4978-b8cc-8a11b67981d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps\flac\include\share">
+      <UniqueIdentifier>{51e03f58-a90d-4ebc-95f7-6af6cdc39165}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="deps\flac\src\libFLAC">
+      <UniqueIdentifier>{4c52c0a3-9e35-4285-a062-290d3667e1d1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\core\hw\aica\aica.h">
@@ -977,6 +1112,108 @@
     <ClInclude Include="..\core\hw\pvr\ta.h">
       <Filter>hw\pvr</Filter>
     </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\7zTypes.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\Alloc.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\Bra.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\Compiler.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\CpuArch.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\Delta.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\LzFind.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\LzHash.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\Lzma86.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\LzmaDec.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\LzmaEnc.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\LzmaLib.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\Precomp.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\lzma\Sort.h">
+      <Filter>deps\lzma</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\all.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\assert.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\callback.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\export.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\format.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\metadata.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\ordinals.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\stream_decoder.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\FLAC\stream_encoder.h">
+      <Filter>deps\flac\include\FLAC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\share\alloc.h">
+      <Filter>deps\flac\include\share</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\share\compat.h">
+      <Filter>deps\flac\include\share</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\share\endswap.h">
+      <Filter>deps\flac\include\share</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\share\macros.h">
+      <Filter>deps\flac\include\share</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\share\safe_str.h">
+      <Filter>deps\flac\include\share</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\share\win_utf8_io.h">
+      <Filter>deps\flac\include\share</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\flac\include\share\windows_unicode_filenames.h">
+      <Filter>deps\flac\include\share</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\chdr\bitstream.h">
+      <Filter>deps\chdr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\chdr\cdrom.h">
+      <Filter>deps\chdr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\chdr\flac.h">
+      <Filter>deps\chdr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\core\deps\chdr\huffman.h">
+      <Filter>deps\chdr</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\core\deps\zlib\Makefile">