Merge ext/native/ext/... directly into ext.

.ycm_extra_conf.py

@@ -41,7 +41,7 @@ flags = [
 '-fexceptions',
 '-DNDEBUG',
 '-Iext/native',
-'-Iext/native/ext',
+'-Iext',
 '-Iext/glew',
 '-ICommon',
 # THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which

CMakeLists.txt

@@ -400,12 +400,6 @@ if(NOT (X86 OR ARM OR MIPS))
 	source_group(Fake FILES ${CommonFake})
 endif()
 
-set(CommonWindows
-	Common/stdafx.cpp
-	Common/stdafx.h
-)
-source_group(Windows FILES ${CommonWindows})
-
 set(CommonVulkan ${CommonExtra}
 	Common/Vulkan/VulkanDebug.cpp
 	Common/Vulkan/VulkanDebug.h
@@ -425,7 +419,6 @@ add_library(Common STATIC
 	${CommonARM64}
 	${CommonMIPS}
 	${CommonFake}
-	${CommonWindows}
 	${CommonVulkan}
 	Common/Serialize/Serializer.cpp
 	Common/Serialize/Serializer.h
@@ -518,8 +511,8 @@ if(USING_GLES2 OR (USING_EGL AND NOT USING_FBDEV))
 endif()
 
 add_library(gason STATIC
-	ext/native/ext/gason/gason.cpp
+	ext/gason/gason.cpp
-	ext/native/ext/gason/gason.h
+	ext/gason/gason.h
 )
 
 if(USE_FFMPEG)
@@ -610,9 +603,9 @@ else()
 endif()
 
 add_library(cityhash STATIC
-	ext/native/ext/cityhash/city.cpp
+	ext/cityhash/city.cpp
-	ext/native/ext/cityhash/city.h
+	ext/cityhash/city.h
-	ext/native/ext/cityhash/citycrc.h
+	ext/cityhash/citycrc.h
 )
 include_directories(ext/cityhash)
 
@@ -631,64 +624,64 @@ if(LIBZIP_FOUND AND USE_SYSTEM_LIBZIP)
 	add_definitions(-DSHARED_LIBZIP)
 else()
 	add_library(libzip STATIC
-		ext/native/ext/libzip/zip.h
+		ext/libzip/zip.h
-		ext/native/ext/libzip/mkstemp.c
+		ext/libzip/mkstemp.c
-		ext/native/ext/libzip/zip_add.c
+		ext/libzip/zip_add.c
-		ext/native/ext/libzip/zip_add_dir.c
+		ext/libzip/zip_add_dir.c
-		ext/native/ext/libzip/zip_close.c
+		ext/libzip/zip_close.c
-		ext/native/ext/libzip/zip_delete.c
+		ext/libzip/zip_delete.c
-		ext/native/ext/libzip/zip_dirent.c
+		ext/libzip/zip_dirent.c
-		ext/native/ext/libzip/zip_entry_free.c
+		ext/libzip/zip_entry_free.c
-		ext/native/ext/libzip/zip_entry_new.c
+		ext/libzip/zip_entry_new.c
-		ext/native/ext/libzip/zip_err_str.c
+		ext/libzip/zip_err_str.c
-		ext/native/ext/libzip/zip_error.c
+		ext/libzip/zip_error.c
-		ext/native/ext/libzip/zip_error_clear.c
+		ext/libzip/zip_error_clear.c
-		ext/native/ext/libzip/zip_error_get.c
+		ext/libzip/zip_error_get.c
-		ext/native/ext/libzip/zip_error_get_sys_type.c
+		ext/libzip/zip_error_get_sys_type.c
-		ext/native/ext/libzip/zip_error_strerror.c
+		ext/libzip/zip_error_strerror.c
-		ext/native/ext/libzip/zip_error_to_str.c
+		ext/libzip/zip_error_to_str.c
-		ext/native/ext/libzip/zip_fclose.c
+		ext/libzip/zip_fclose.c
-		ext/native/ext/libzip/zip_file_error_clear.c
+		ext/libzip/zip_file_error_clear.c
-		ext/native/ext/libzip/zip_file_error_get.c
+		ext/libzip/zip_file_error_get.c
-		ext/native/ext/libzip/zip_file_get_offset.c
+		ext/libzip/zip_file_get_offset.c
-		ext/native/ext/libzip/zip_file_strerror.c
+		ext/libzip/zip_file_strerror.c
-		ext/native/ext/libzip/zip_filerange_crc.c
+		ext/libzip/zip_filerange_crc.c
-		ext/native/ext/libzip/zip_fopen.c
+		ext/libzip/zip_fopen.c
-		ext/native/ext/libzip/zip_fopen_index.c
+		ext/libzip/zip_fopen_index.c
-		ext/native/ext/libzip/zip_fread.c
+		ext/libzip/zip_fread.c
-		ext/native/ext/libzip/zip_free.c
+		ext/libzip/zip_free.c
-		ext/native/ext/libzip/zip_get_archive_comment.c
+		ext/libzip/zip_get_archive_comment.c
-		ext/native/ext/libzip/zip_get_archive_flag.c
+		ext/libzip/zip_get_archive_flag.c
-		ext/native/ext/libzip/zip_get_file_comment.c
+		ext/libzip/zip_get_file_comment.c
-		ext/native/ext/libzip/zip_get_name.c
+		ext/libzip/zip_get_name.c
-		ext/native/ext/libzip/zip_get_num_files.c
+		ext/libzip/zip_get_num_files.c
-		ext/native/ext/libzip/zip_memdup.c
+		ext/libzip/zip_memdup.c
-		ext/native/ext/libzip/zip_name_locate.c
+		ext/libzip/zip_name_locate.c
-		ext/native/ext/libzip/zip_new.c
+		ext/libzip/zip_new.c
-		ext/native/ext/libzip/zip_open.c
+		ext/libzip/zip_open.c
-		ext/native/ext/libzip/zip_rename.c
+		ext/libzip/zip_rename.c
-		ext/native/ext/libzip/zip_replace.c
+		ext/libzip/zip_replace.c
-		ext/native/ext/libzip/zip_set_archive_comment.c
+		ext/libzip/zip_set_archive_comment.c
-		ext/native/ext/libzip/zip_set_archive_flag.c
+		ext/libzip/zip_set_archive_flag.c
-		ext/native/ext/libzip/zip_set_file_comment.c
+		ext/libzip/zip_set_file_comment.c
-		ext/native/ext/libzip/zip_set_name.c
+		ext/libzip/zip_set_name.c
-		ext/native/ext/libzip/zip_source_buffer.c
+		ext/libzip/zip_source_buffer.c
-		ext/native/ext/libzip/zip_source_file.c
+		ext/libzip/zip_source_file.c
-		ext/native/ext/libzip/zip_source_filep.c
+		ext/libzip/zip_source_filep.c
-		ext/native/ext/libzip/zip_source_free.c
+		ext/libzip/zip_source_free.c
-		ext/native/ext/libzip/zip_source_function.c
+		ext/libzip/zip_source_function.c
-		ext/native/ext/libzip/zip_source_zip.c
+		ext/libzip/zip_source_zip.c
-		ext/native/ext/libzip/zip_stat.c
+		ext/libzip/zip_stat.c
-		ext/native/ext/libzip/zip_stat_index.c
+		ext/libzip/zip_stat_index.c
-		ext/native/ext/libzip/zip_stat_init.c
+		ext/libzip/zip_stat_init.c
-		ext/native/ext/libzip/zip_strerror.c
+		ext/libzip/zip_strerror.c
-		ext/native/ext/libzip/zip_unchange.c
+		ext/libzip/zip_unchange.c
-		ext/native/ext/libzip/zip_unchange_all.c
+		ext/libzip/zip_unchange_all.c
-		ext/native/ext/libzip/zip_unchange_archive.c
+		ext/libzip/zip_unchange_archive.c
-		ext/native/ext/libzip/zip_unchange_data.c
+		ext/libzip/zip_unchange_data.c
 	)
 	target_link_libraries(libzip)
-	include_directories(ext/native/ext/libzip)
+	include_directories(ext/libzip)
 	set(LIBZIP_LIBRARY libzip)
 endif()
 
@@ -705,38 +698,38 @@ if(PNG_FOUND)
 else()
 	if(ARM)
 		set(PNG_ARM_INCLUDES
-			ext/native/ext/libpng17/arm/arm_init.c
+			ext/libpng17/arm/arm_init.c
-			ext/native/ext/libpng17/arm/filter_neon.S
+			ext/libpng17/arm/filter_neon.S
-			ext/native/ext/libpng17/arm/filter_neon_intrinsics.c
+			ext/libpng17/arm/filter_neon_intrinsics.c
 		)
 	endif()
 	add_library(png17 STATIC
-		ext/native/ext/libpng17/pngconf.h
+		ext/libpng17/pngconf.h
-		ext/native/ext/libpng17/pngdebug.h
+		ext/libpng17/pngdebug.h
-		ext/native/ext/libpng17/png.c
+		ext/libpng17/png.c
-		ext/native/ext/libpng17/png.h
+		ext/libpng17/png.h
-		ext/native/ext/libpng17/pngerror.c
+		ext/libpng17/pngerror.c
-		ext/native/ext/libpng17/pngget.c
+		ext/libpng17/pngget.c
-		ext/native/ext/libpng17/pnginfo.h
+		ext/libpng17/pnginfo.h
-		ext/native/ext/libpng17/pnglibconf.h
+		ext/libpng17/pnglibconf.h
-		ext/native/ext/libpng17/pngmem.c
+		ext/libpng17/pngmem.c
-		ext/native/ext/libpng17/pngpread.c
+		ext/libpng17/pngpread.c
-		ext/native/ext/libpng17/pngpriv.h
+		ext/libpng17/pngpriv.h
-		ext/native/ext/libpng17/pngread.c
+		ext/libpng17/pngread.c
-		ext/native/ext/libpng17/pngrio.c
+		ext/libpng17/pngrio.c
-		ext/native/ext/libpng17/pngrtran.c
+		ext/libpng17/pngrtran.c
-		ext/native/ext/libpng17/pngrutil.c
+		ext/libpng17/pngrutil.c
-		ext/native/ext/libpng17/pngset.c
+		ext/libpng17/pngset.c
-		ext/native/ext/libpng17/pngstruct.h
+		ext/libpng17/pngstruct.h
-		ext/native/ext/libpng17/pngtrans.c
+		ext/libpng17/pngtrans.c
-		ext/native/ext/libpng17/pngwio.c
+		ext/libpng17/pngwio.c
-		ext/native/ext/libpng17/pngwrite.c
+		ext/libpng17/pngwrite.c
-		ext/native/ext/libpng17/pngwtran.c
+		ext/libpng17/pngwtran.c
-		ext/native/ext/libpng17/pngwutil.c
+		ext/libpng17/pngwutil.c
 		${PNG_ARM_INCLUDES}
 	)
 	set(PNG_LIBRARIES png17)
-	include_directories(ext/native/ext/libpng17)
+	include_directories(ext/libpng17)
 endif()
 
 set(nativeExtra)
@@ -1087,10 +1080,10 @@ add_library(native STATIC
 	ext/native/util/text/wrap_text.cpp
 	ext/native/util/const_map.h
 	ext/native/util/tiny_set.h
-	ext/native/ext/jpge/jpgd.cpp
+	ext/jpge/jpgd.cpp
-	ext/native/ext/jpge/jpgd.h
+	ext/jpge/jpgd.h
-	ext/native/ext/jpge/jpge.cpp
+	ext/jpge/jpge.cpp
-	ext/native/ext/jpge/jpge.h
+	ext/jpge/jpge.h
 )
 include_directories(ext/native)
 

Common/Common.vcxproj

@@ -132,12 +132,11 @@
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>stdafx.h;Common/DbgNew.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>Common/DbgNew.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -155,12 +154,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <ForcedIncludeFiles>stdafx.h;Common/DbgNew.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>Common/DbgNew.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <OmitFramePointers>false</OmitFramePointers>
@@ -179,12 +177,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <ForcedIncludeFiles>stdafx.h;Common/DbgNew.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>Common/DbgNew.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <OmitFramePointers>false</OmitFramePointers>
@@ -203,12 +200,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>
+      </ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <OmitFramePointers>false</OmitFramePointers>
@@ -228,16 +225,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>
+      </ForcedIncludeFiles>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -257,13 +254,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      </ForcedIncludeFiles>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -288,13 +285,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      </ForcedIncludeFiles>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -319,13 +316,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;..</AdditionalIncludeDirectories>
+      </ForcedIncludeFiles>
+      <AdditionalIncludeDirectories>../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;..</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -348,6 +345,13 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\ext\libpng17\png.h" />
+    <ClInclude Include="..\ext\libpng17\pngconf.h" />
+    <ClInclude Include="..\ext\libpng17\pngdebug.h" />
+    <ClInclude Include="..\ext\libpng17\pnginfo.h" />
+    <ClInclude Include="..\ext\libpng17\pnglibconf.h" />
+    <ClInclude Include="..\ext\libpng17\pngpriv.h" />
+    <ClInclude Include="..\ext\libpng17\pngstruct.h" />
     <ClInclude Include="ABI.h" />
     <ClInclude Include="Arm64Emitter.h" />
     <ClInclude Include="ArmCommon.h" />
@@ -411,7 +415,6 @@
     <ClInclude Include="MipsEmitter.h" />
     <ClInclude Include="OSVersion.h" />
     <ClInclude Include="Serialize\SerializeSet.h" />
-    <ClInclude Include="stdafx.h" />
     <ClInclude Include="StringUtils.h" />
     <ClInclude Include="Swap.h" />
     <ClInclude Include="SysError.h" />
@@ -429,6 +432,157 @@
     <ClInclude Include="x64Emitter.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\ext\libpng17\png.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngerror.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngget.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngmem.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngpread.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngread.c" />
+    <ClCompile Include="..\ext\libpng17\pngrio.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngrtran.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngrutil.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngset.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngtest.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngtrans.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwio.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwrite.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwtran.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwutil.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="ABI.cpp" />
     <ClCompile Include="Arm64Emitter.cpp" />
     <ClCompile Include="ArmCPUDetect.cpp">
@@ -503,16 +657,6 @@
     <ClCompile Include="MipsEmitter.cpp" />
     <ClCompile Include="SysError.cpp" />
     <ClCompile Include="OSVersion.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="StringUtils.cpp" />
     <ClCompile Include="ThreadPools.cpp" />
     <ClCompile Include="Thunk.cpp" />
@@ -527,8 +671,11 @@
     <ClCompile Include="x64Emitter.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ext\native\native.vcxproj">
+    <Text Include="..\ext\libpng17\CMakeLists.txt" />
-      <Project>{c4df647e-80ea-4111-a0a8-218b1b711e18}</Project>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ext\zlib\zlib.vcxproj">
+      <Project>{f761046e-6c38-4428-a5f1-38391a37bb34}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Common/Common.vcxproj.filters

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClInclude Include="stdafx.h" />
     <ClInclude Include="ABI.h" />
     <ClInclude Include="Common.h" />
     <ClInclude Include="CommonFuncs.h" />
@@ -96,9 +95,29 @@
     <ClInclude Include="FakeEmitter.h" />
     <ClInclude Include="Buffer.h" />
     <ClInclude Include="SysError.h" />
+    <ClInclude Include="..\ext\libpng17\png.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libpng17\pngconf.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libpng17\pngdebug.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libpng17\pnginfo.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libpng17\pnglibconf.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libpng17\pngpriv.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libpng17\pngstruct.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp" />
     <ClCompile Include="ABI.cpp" />
     <ClCompile Include="ConsoleListener.cpp" />
     <ClCompile Include="CPUDetect.cpp" />
@@ -164,6 +183,54 @@
     <ClCompile Include="Log.cpp" />
     <ClCompile Include="Buffer.cpp" />
     <ClCompile Include="SysError.cpp" />
+    <ClCompile Include="..\ext\libpng17\png.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngerror.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngget.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngmem.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngpread.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngread.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngrio.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngrtran.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngrutil.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngset.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngtest.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngtrans.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwio.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwrite.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwtran.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libpng17\pngwutil.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
@@ -181,5 +248,16 @@
     <Filter Include="Serialize">
       <UniqueIdentifier>{7be79ad5-3520-46a1-a370-dce2a943978c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ext">
+      <UniqueIdentifier>{b2685193-5954-4ab6-af7c-d6064f63e278}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ext\libpng17">
+      <UniqueIdentifier>{1d04f87f-73a2-4027-a6ff-e998e92e7d3c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\ext\libpng17\CMakeLists.txt">
+      <Filter>ext\libpng17</Filter>
+    </Text>
   </ItemGroup>
 </Project>

Common/stdafx.cpp

@@ -1,11 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// Common.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#ifdef _WIN32
-
-#include "stdafx.h"
-
-#endif
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file

Common/stdafx.h

@@ -1,42 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0 or later versions.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#pragma once
-
-#ifdef _WIN32
-#ifndef _WIN32_WINNT
-
-#if defined(_MSC_VER) && _MSC_VER < 1700
-#error You need a newer version of Visual Studio.
-#else
-#define _WIN32_WINNT 0x601
-#endif
-
-#endif // #ifndef _WIN32_WINNT
-
-#undef WINVER
-#define WINVER _WIN32_WINNT
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0600       // Default value is 0x0400
-#endif
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
-#include "CommonWindows.h"
-#include <tchar.h>
-#include <vector>
-#endif

Core/Core.vcxproj

@@ -138,7 +138,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -161,7 +161,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -185,7 +185,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -209,7 +209,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -237,7 +237,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
@@ -268,7 +268,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -299,7 +299,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -330,7 +330,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Precise</FloatingPointModel>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -356,8 +356,67 @@
     </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\ext\cityhash\city.cpp" />
     <ClCompile Include="..\ext\disarm.cpp" />
+    <ClCompile Include="..\ext\gason\gason.cpp" />
+    <ClCompile Include="..\ext\jpge\jpgd.cpp" />
+    <ClCompile Include="..\ext\jpge\jpge.cpp" />
+    <ClCompile Include="..\ext\libzip\mkstemp.c" />
+    <ClCompile Include="..\ext\libzip\zip_add.c" />
+    <ClCompile Include="..\ext\libzip\zip_add_dir.c" />
+    <ClCompile Include="..\ext\libzip\zip_close.c" />
+    <ClCompile Include="..\ext\libzip\zip_delete.c" />
+    <ClCompile Include="..\ext\libzip\zip_dirent.c" />
+    <ClCompile Include="..\ext\libzip\zip_entry_free.c" />
+    <ClCompile Include="..\ext\libzip\zip_entry_new.c" />
+    <ClCompile Include="..\ext\libzip\zip_error.c" />
+    <ClCompile Include="..\ext\libzip\zip_error_clear.c" />
+    <ClCompile Include="..\ext\libzip\zip_error_get.c" />
+    <ClCompile Include="..\ext\libzip\zip_error_get_sys_type.c" />
+    <ClCompile Include="..\ext\libzip\zip_error_strerror.c" />
+    <ClCompile Include="..\ext\libzip\zip_error_to_str.c" />
+    <ClCompile Include="..\ext\libzip\zip_err_str.c" />
+    <ClCompile Include="..\ext\libzip\zip_fclose.c" />
+    <ClCompile Include="..\ext\libzip\zip_filerange_crc.c" />
+    <ClCompile Include="..\ext\libzip\zip_file_error_clear.c" />
+    <ClCompile Include="..\ext\libzip\zip_file_error_get.c" />
+    <ClCompile Include="..\ext\libzip\zip_file_get_offset.c" />
+    <ClCompile Include="..\ext\libzip\zip_file_strerror.c" />
+    <ClCompile Include="..\ext\libzip\zip_fopen.c" />
+    <ClCompile Include="..\ext\libzip\zip_fopen_index.c" />
+    <ClCompile Include="..\ext\libzip\zip_fread.c" />
+    <ClCompile Include="..\ext\libzip\zip_free.c" />
+    <ClCompile Include="..\ext\libzip\zip_get_archive_comment.c" />
+    <ClCompile Include="..\ext\libzip\zip_get_archive_flag.c" />
+    <ClCompile Include="..\ext\libzip\zip_get_file_comment.c" />
+    <ClCompile Include="..\ext\libzip\zip_get_name.c" />
+    <ClCompile Include="..\ext\libzip\zip_get_num_files.c" />
+    <ClCompile Include="..\ext\libzip\zip_memdup.c" />
+    <ClCompile Include="..\ext\libzip\zip_name_locate.c" />
+    <ClCompile Include="..\ext\libzip\zip_new.c" />
+    <ClCompile Include="..\ext\libzip\zip_open.c" />
+    <ClCompile Include="..\ext\libzip\zip_rename.c" />
+    <ClCompile Include="..\ext\libzip\zip_replace.c" />
+    <ClCompile Include="..\ext\libzip\zip_set_archive_comment.c" />
+    <ClCompile Include="..\ext\libzip\zip_set_archive_flag.c" />
+    <ClCompile Include="..\ext\libzip\zip_set_file_comment.c" />
+    <ClCompile Include="..\ext\libzip\zip_set_name.c" />
+    <ClCompile Include="..\ext\libzip\zip_source_buffer.c" />
+    <ClCompile Include="..\ext\libzip\zip_source_file.c" />
+    <ClCompile Include="..\ext\libzip\zip_source_filep.c" />
+    <ClCompile Include="..\ext\libzip\zip_source_free.c" />
+    <ClCompile Include="..\ext\libzip\zip_source_function.c" />
+    <ClCompile Include="..\ext\libzip\zip_source_zip.c" />
+    <ClCompile Include="..\ext\libzip\zip_stat.c" />
+    <ClCompile Include="..\ext\libzip\zip_stat_index.c" />
+    <ClCompile Include="..\ext\libzip\zip_stat_init.c" />
+    <ClCompile Include="..\ext\libzip\zip_strerror.c" />
+    <ClCompile Include="..\ext\libzip\zip_unchange.c" />
+    <ClCompile Include="..\ext\libzip\zip_unchange_all.c" />
+    <ClCompile Include="..\ext\libzip\zip_unchange_archive.c" />
+    <ClCompile Include="..\ext\libzip\zip_unchange_data.c" />
     <ClCompile Include="..\ext\sfmt19937\SFMT.c" />
+    <ClCompile Include="..\ext\sha1\sha1.cpp" />
     <ClCompile Include="..\ext\snappy\snappy-c.cpp" />
     <ClCompile Include="..\ext\snappy\snappy-sinksource.cpp" />
     <ClCompile Include="..\ext\snappy\snappy-stubs-internal.cpp" />
@@ -885,11 +944,20 @@
     <ClCompile Include="WebServer.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\ext\cityhash\city.h" />
+    <ClInclude Include="..\ext\cityhash\citycrc.h" />
     <ClInclude Include="..\ext\disarm.h" />
+    <ClInclude Include="..\ext\gason\gason.h" />
+    <ClInclude Include="..\ext\jpge\jpgd.h" />
+    <ClInclude Include="..\ext\jpge\jpge.h" />
+    <ClInclude Include="..\ext\libzip\config.h" />
+    <ClInclude Include="..\ext\libzip\zip.h" />
+    <ClInclude Include="..\ext\libzip\zipint.h" />
     <ClInclude Include="..\ext\sfmt19937\SFMT-common.h" />
     <ClInclude Include="..\ext\sfmt19937\SFMT-params.h" />
     <ClInclude Include="..\ext\sfmt19937\SFMT-params19937.h" />
     <ClInclude Include="..\ext\sfmt19937\SFMT.h" />
+    <ClInclude Include="..\ext\sha1\sha1.h" />
     <ClInclude Include="..\ext\snappy\snappy-internal.h" />
     <ClInclude Include="..\ext\snappy\snappy-sinksource.h" />
     <ClInclude Include="..\ext\snappy\snappy-stubs-internal.h" />
@@ -1197,6 +1265,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\android\jni\Android.mk" />
+    <None Include="..\ext\cityhash\COPYING" />
+    <None Include="..\ext\cityhash\README" />
+    <None Include="..\ext\gason\LICENSE" />
+    <None Include="..\ext\libzip\Android.mk" />
     <None Include="..\LICENSE.TXT" />
     <None Include="CMakeLists.txt" />
   </ItemGroup>
@@ -1220,6 +1292,10 @@
       <Project>{f761046e-6c38-4428-a5f1-38391a37bb34}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\ext\libzip\CMakeLists.txt" />
+    <Text Include="..\ext\sha1\CMakeLists.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Core/Core.vcxproj.filters

@@ -73,6 +73,21 @@
     <Filter Include="Debugger\WebSocket">
       <UniqueIdentifier>{c21d9bb5-614d-451b-8c0b-3078b29122d8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Ext\gason">
+      <UniqueIdentifier>{db010645-6b26-41a7-8d44-c53cb0533d7d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Ext\city">
+      <UniqueIdentifier>{cf1a59fe-8509-48f0-84d0-27c71cb10dc3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Ext\sha1">
+      <UniqueIdentifier>{d8c48d88-2e34-4a98-aa88-4277a3b8afea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Ext\jpge">
+      <UniqueIdentifier>{6c6e0188-fabf-4203-aaa2-896c42be2c20}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Ext\libzip">
+      <UniqueIdentifier>{0201ff27-4fa8-4cf3-bbb9-accfdc0c7046}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ELF\ElfReader.cpp">
@@ -767,6 +782,183 @@
     <ClCompile Include="..\ext\snappy\snappy-sinksource.cpp">
       <Filter>Ext\Snappy</Filter>
     </ClCompile>
+    <ClCompile Include="..\ext\gason\gason.cpp">
+      <Filter>Ext\gason</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\cityhash\city.cpp">
+      <Filter>Ext\city</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\sha1\sha1.cpp">
+      <Filter>Ext\sha1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\jpge\jpgd.cpp">
+      <Filter>Ext\jpge</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\jpge\jpge.cpp">
+      <Filter>Ext\jpge</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\mkstemp.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_add.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_add_dir.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_close.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_delete.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_dirent.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_entry_free.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_entry_new.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_err_str.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_error.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_error_clear.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_error_get.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_error_get_sys_type.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_error_strerror.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_error_to_str.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_fclose.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_file_error_clear.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_file_error_get.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_file_get_offset.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_file_strerror.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_filerange_crc.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_fopen.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_fopen_index.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_fread.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_free.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_get_archive_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_get_archive_flag.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_get_file_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_get_name.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_get_num_files.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_memdup.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_name_locate.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_new.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_open.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_rename.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_replace.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_set_archive_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_set_archive_flag.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_set_file_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_set_name.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_source_buffer.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_source_file.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_source_filep.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_source_free.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_source_function.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_source_zip.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_stat.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_stat_index.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_stat_init.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_strerror.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_unchange.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_unchange_all.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_unchange_archive.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\libzip\zip_unchange_data.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ELF\ElfReader.h">
@@ -1418,10 +1610,57 @@
     <ClInclude Include="HLE\Plugins.h">
       <Filter>HLE</Filter>
     </ClInclude>
+    <ClInclude Include="..\ext\gason\gason.h">
+      <Filter>Ext\gason</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\cityhash\city.h">
+      <Filter>Ext\city</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\cityhash\citycrc.h">
+      <Filter>Ext\city</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\sha1\sha1.h">
+      <Filter>Ext\sha1</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\jpge\jpgd.h">
+      <Filter>Ext\jpge</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\jpge\jpge.h">
+      <Filter>Ext\jpge</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libzip\config.h">
+      <Filter>Ext\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libzip\zip.h">
+      <Filter>Ext\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\libzip\zipint.h">
+      <Filter>Ext\libzip</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
     <None Include="..\LICENSE.TXT" />
     <None Include="..\android\jni\Android.mk" />
+    <None Include="..\ext\gason\LICENSE">
+      <Filter>Ext\gason</Filter>
+    </None>
+    <None Include="..\ext\cityhash\COPYING">
+      <Filter>Ext\city</Filter>
+    </None>
+    <None Include="..\ext\cityhash\README">
+      <Filter>Ext\city</Filter>
+    </None>
+    <None Include="..\ext\libzip\Android.mk">
+      <Filter>Ext\libzip</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\ext\sha1\CMakeLists.txt">
+      <Filter>Ext\sha1</Filter>
+    </Text>
+    <Text Include="..\ext\libzip\CMakeLists.txt">
+      <Filter>Ext\libzip</Filter>
+    </Text>
   </ItemGroup>
 </Project>

Core/MIPS/MIPSAsm.cpp

@@ -1,6 +1,3 @@
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
 #include <cstdarg>
 #include <cstring>
 #include <memory>

UI/UI.vcxproj

@@ -207,7 +207,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -227,7 +227,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -248,7 +248,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -269,7 +269,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -294,7 +294,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -319,7 +319,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -346,7 +346,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -373,7 +373,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -394,4 +394,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

UWP/CommonUWP/CommonUWP.vcxproj

@@ -200,12 +200,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -215,12 +215,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -230,12 +230,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -245,12 +245,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -260,12 +260,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -275,12 +275,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -290,12 +290,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -305,12 +305,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|arm'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -320,12 +320,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|ARM64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -335,12 +335,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -350,12 +350,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -365,12 +365,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -417,7 +417,6 @@
     <ClInclude Include="..\..\Common\MemoryUtil.h" />
     <ClInclude Include="..\..\Common\MipsEmitter.h" />
     <ClInclude Include="..\..\Common\OSVersion.h" />
-    <ClInclude Include="..\..\Common\stdafx.h" />
     <ClInclude Include="..\..\Common\StringUtils.h" />
     <ClInclude Include="..\..\Common\Swap.h" />
     <ClInclude Include="..\..\Common\SysError.h" />
@@ -428,7 +427,13 @@
     <ClInclude Include="..\..\Common\TimeUtil.h" />
     <ClInclude Include="..\..\Common\x64Analyzer.h" />
     <ClInclude Include="..\..\Common\x64Emitter.h" />
-    <ClInclude Include="pch.h" />
+    <ClInclude Include="..\..\ext\libpng17\png.h" />
+    <ClInclude Include="..\..\ext\libpng17\pngconf.h" />
+    <ClInclude Include="..\..\ext\libpng17\pngdebug.h" />
+    <ClInclude Include="..\..\ext\libpng17\pnginfo.h" />
+    <ClInclude Include="..\..\ext\libpng17\pnglibconf.h" />
+    <ClInclude Include="..\..\ext\libpng17\pngpriv.h" />
+    <ClInclude Include="..\..\ext\libpng17\pngstruct.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
@@ -459,7 +464,6 @@
     <ClCompile Include="..\..\Common\MipsEmitter.cpp" />
     <ClCompile Include="..\..\Common\SysError.cpp" />
     <ClCompile Include="..\..\Common\OSVersion.cpp" />
-    <ClCompile Include="..\..\Common\stdafx.cpp" />
     <ClCompile Include="..\..\Common\StringUtils.cpp" />
     <ClCompile Include="..\..\Common\ThreadPools.cpp" />
     <ClCompile Include="..\..\Common\Thunk.cpp" />
@@ -467,22 +471,27 @@
     <ClCompile Include="..\..\Common\TimeUtil.cpp" />
     <ClCompile Include="..\..\Common\x64Analyzer.cpp" />
     <ClCompile Include="..\..\Common\x64Emitter.cpp" />
-    <ClCompile Include="pch.cpp">
+    <ClCompile Include="..\..\ext\libpng17\png.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngerror.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngget.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UWP Gold|Win32'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngmem.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngpread.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngread.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngrio.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngrtran.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UWP Gold|ARM'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngrutil.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UWP Gold|ARM64'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngset.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngtest.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngtrans.c" />
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UWP Gold|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="..\..\ext\libpng17\pngwio.c" />
-    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngwrite.c" />
+    <ClCompile Include="..\..\ext\libpng17\pngwtran.c" />
+    <ClCompile Include="..\..\ext\libpng17\pngwutil.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\ext\libpng17\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

UWP/CommonUWP/CommonUWP.vcxproj.filters

@@ -4,9 +4,14 @@
     <Filter Include="Crypto">
       <UniqueIdentifier>{da855697-f7aa-49bf-b969-7a90c5b4d259}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ext">
+      <UniqueIdentifier>{c2303262-a4f0-4400-8dd7-35ad6ac5f443}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ext\libpng17">
+      <UniqueIdentifier>{b0ac485c-3153-4708-b098-f5a518a95b79}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="pch.cpp" />
     <ClCompile Include="..\..\Common\ABI.cpp" />
     <ClCompile Include="..\..\Common\Arm64Emitter.cpp" />
     <ClCompile Include="..\..\Common\ArmCPUDetect.cpp" />
@@ -30,7 +35,6 @@
     <ClCompile Include="..\..\Common\MipsEmitter.cpp" />
     <ClCompile Include="..\..\Common\SysError.cpp" />
     <ClCompile Include="..\..\Common\OSVersion.cpp" />
-    <ClCompile Include="..\..\Common\stdafx.cpp" />
     <ClCompile Include="..\..\Common\StringUtils.cpp" />
     <ClCompile Include="..\..\Common\ThreadPools.cpp" />
     <ClCompile Include="..\..\Common\Thunk.cpp" />
@@ -47,9 +51,57 @@
     <ClCompile Include="..\..\Common\Crypto\sha256.cpp">
       <Filter>Crypto</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Common\Buffer.cpp" />
+    <ClCompile Include="..\..\ext\libpng17\png.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngerror.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngget.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngmem.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngpread.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngread.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngrio.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngrtran.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngrutil.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngset.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngtest.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngtrans.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngwio.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngwrite.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngwtran.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libpng17\pngwutil.c">
+      <Filter>ext\libpng17</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="..\..\Common\ABI.h" />
     <ClInclude Include="..\..\Common\Arm64Emitter.h" />
@@ -58,11 +110,6 @@
     <ClInclude Include="..\..\Common\BitSet.h" />
     <ClInclude Include="..\..\Common\BitScan.h" />
     <ClInclude Include="..\..\Common\Serialize\Serializer.h" />
-    <ClInclude Include="..\..\Common\Serialize\SerializerDeque.h" />
-    <ClInclude Include="..\..\Common\Serialize\SerializerFuncs.h" />
-    <ClInclude Include="..\..\Common\Serialize\SerializerList.h" />
-    <ClInclude Include="..\..\Common\Serialize\SerializerMap.h" />
-    <ClInclude Include="..\..\Common\Serialize\SerializerSet.h" />
     <ClInclude Include="..\..\Common\CodeBlock.h" />
     <ClInclude Include="..\..\Common\ColorConv.h" />
     <ClInclude Include="..\..\Common\ColorConvNEON.h" />
@@ -85,7 +132,6 @@
     <ClInclude Include="..\..\Common\MemoryUtil.h" />
     <ClInclude Include="..\..\Common\MipsEmitter.h" />
     <ClInclude Include="..\..\Common\OSVersion.h" />
-    <ClInclude Include="..\..\Common\stdafx.h" />
     <ClInclude Include="..\..\Common\StringUtils.h" />
     <ClInclude Include="..\..\Common\Swap.h" />
     <ClInclude Include="..\..\Common\SysError.h" />
@@ -105,5 +151,37 @@
     <ClInclude Include="..\..\Common\Crypto\sha256.h">
       <Filter>Crypto</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Common\Buffer.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeDeque.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeFuncs.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeList.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeMap.h" />
+    <ClInclude Include="..\..\Common\Serialize\SerializeSet.h" />
+    <ClInclude Include="..\..\ext\libpng17\png.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libpng17\pngconf.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libpng17\pngdebug.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libpng17\pnginfo.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libpng17\pnglibconf.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libpng17\pngpriv.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libpng17\pngstruct.h">
+      <Filter>ext\libpng17</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Text Include="..\..\ext\libpng17\CMakeLists.txt">
+      <Filter>ext\libpng17</Filter>
+    </Text>
+  </ItemGroup>
+</Project>

UWP/CoreUWP/CoreUWP.vcxproj.filters

@@ -71,6 +71,18 @@
     <Filter Include="MIPS\ARM64">
       <UniqueIdentifier>{3b1039f9-72dc-4c7f-bd4e-25791be20df7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Ext\gason">
+      <UniqueIdentifier>{613b4e2e-264b-4ae8-9b23-bc15590ffa11}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Ext\cityhash">
+      <UniqueIdentifier>{e20f358f-a614-47ff-a5b7-164c82e613a9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Ext\jpge">
+      <UniqueIdentifier>{69359915-04ac-4d1f-a7ba-25b282c26ae9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Ext\libzip">
+      <UniqueIdentifier>{1ad7ee67-c496-4709-bf98-cad322fe5d97}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />
@@ -724,6 +736,180 @@
     <ClCompile Include="..\..\Core\Util\PortManager.cpp">
       <Filter>Util</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\ext\gason\gason.cpp">
+      <Filter>Ext\gason</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\cityhash\city.cpp">
+      <Filter>Ext\cityhash</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\jpge\jpgd.cpp">
+      <Filter>Ext\jpge</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\jpge\jpge.cpp">
+      <Filter>Ext\jpge</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\mkstemp.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_add.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_add_dir.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_close.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_delete.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_dirent.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_entry_free.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_entry_new.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_err_str.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_error.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_error_clear.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_error_get.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_error_get_sys_type.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_error_strerror.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_error_to_str.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_fclose.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_file_error_clear.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_file_error_get.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_file_get_offset.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_file_strerror.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_filerange_crc.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_fopen.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_fopen_index.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_fread.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_free.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_get_archive_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_get_archive_flag.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_get_file_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_get_name.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_get_num_files.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_memdup.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_name_locate.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_new.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_open.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_rename.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_replace.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_set_archive_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_set_archive_flag.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_set_file_comment.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_set_name.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_source_buffer.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_source_file.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_source_filep.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_source_free.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_source_function.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_source_zip.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_stat.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_stat_index.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_stat_init.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_strerror.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_unchange.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_unchange_all.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_unchange_archive.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libzip\zip_unchange_data.c">
+      <Filter>Ext\libzip</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -1330,5 +1516,34 @@
     <ClInclude Include="..\..\Core\Util\PortManager.h">
       <Filter>Util</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\ext\gason\gason.h">
+      <Filter>Ext\gason</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\cityhash\city.h">
+      <Filter>Ext\cityhash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\cityhash\citycrc.h">
+      <Filter>Ext\cityhash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\jpge\jpgd.h">
+      <Filter>Ext\jpge</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\jpge\jpge.h">
+      <Filter>Ext\jpge</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libzip\config.h">
+      <Filter>Ext\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libzip\zip.h">
+      <Filter>Ext\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libzip\zipint.h">
+      <Filter>Ext\libzip</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\ext\gason\LICENSE">
+      <Filter>Ext\gason</Filter>
+    </None>
   </ItemGroup>
 </Project>

UWP/GPU_UWP/GPU_UWP.vcxproj

@@ -204,7 +204,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -219,7 +219,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -234,7 +234,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -249,7 +249,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -264,7 +264,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -279,7 +279,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -294,7 +294,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -309,7 +309,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -324,7 +324,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -339,7 +339,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -354,7 +354,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -369,7 +369,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>

UWP/NativeUWP/NativeUWP.vcxproj.filters

@@ -34,33 +34,12 @@
     <Filter Include="i18n">
       <UniqueIdentifier>{a522f449-7873-4af7-908e-7cc91eb8bfc0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ext">
-      <UniqueIdentifier>{2be24387-0b6a-4253-97fa-b8b6f75a8a4c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ext\libzip">
-      <UniqueIdentifier>{1a486fc4-bac0-4b33-9139-262272690c74}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ext\libpng17">
-      <UniqueIdentifier>{f3b2701a-3ddc-4604-a867-2ee9a0600dab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ext\jpge">
-      <UniqueIdentifier>{34445680-c1be-4aec-a716-1e118ef48906}</UniqueIdentifier>
-    </Filter>
     <Filter Include="image">
       <UniqueIdentifier>{96ac6deb-ad00-4ee4-9f0d-515d78d1886b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ext\cityhash">
-      <UniqueIdentifier>{3ffe0470-9652-4d89-a3d1-7eb989d266ab}</UniqueIdentifier>
-    </Filter>
     <Filter Include="data">
       <UniqueIdentifier>{4d23e7d3-0b9b-4dbe-95df-6ab250782a66}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ext\gason">
-      <UniqueIdentifier>{fb517d8e-e6c4-4eaf-a579-9970daa96541}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ext\sha1">
-      <UniqueIdentifier>{b68fe6a0-b55f-4411-91f4-63ab1eaf47a3}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />
@@ -202,219 +181,6 @@
     <ClCompile Include="..\..\ext\native\i18n\i18n.cpp">
       <Filter>i18n</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\mkstemp.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_add.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_add_dir.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_close.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_delete.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_dirent.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_entry_free.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_entry_new.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_err_str.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_error.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_error_clear.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_error_get.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_error_get_sys_type.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_error_strerror.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_error_to_str.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_fclose.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_file_error_clear.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_file_error_get.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_file_get_offset.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_file_strerror.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_filerange_crc.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_fopen.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_fopen_index.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_fread.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_free.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_get_archive_comment.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_get_archive_flag.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_get_file_comment.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_get_name.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_get_num_files.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_memdup.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_name_locate.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_new.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_open.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_rename.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_replace.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_set_archive_comment.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_set_archive_flag.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_set_file_comment.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_set_name.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_source_buffer.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_source_file.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_source_filep.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_source_free.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_source_function.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_source_zip.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_stat.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_stat_index.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_stat_init.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_strerror.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_unchange.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_unchange_all.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_unchange_archive.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libzip\zip_unchange_data.c">
-      <Filter>ext\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\png.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngerror.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngget.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngmem.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngpread.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngread.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngrio.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngrtran.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngrutil.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngset.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngtrans.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngwio.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngwrite.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngwtran.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\libpng17\pngwutil.c">
-      <Filter>ext\libpng17</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\jpge\jpgd.cpp">
-      <Filter>ext\jpge</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\jpge\jpge.cpp">
-      <Filter>ext\jpge</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\native\gfx_es2\draw_text.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
@@ -424,29 +190,17 @@
     <ClCompile Include="..\..\ext\native\image\zim_load.cpp">
       <Filter>image</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\cityhash\city.cpp">
-      <Filter>ext\cityhash</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\native\gfx_es2\gpu_features.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
     <ClCompile Include="..\..\ext\native\data\compression.cpp">
       <Filter>data</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\native\base\logging.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\native\math\dataconv.cpp">
       <Filter>math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\ext\native\json\json_reader.cpp" />
     <ClCompile Include="..\..\ext\native\json\json_writer.cpp" />
-    <ClCompile Include="..\..\ext\native\ext\gason\gason.cpp">
-      <Filter>ext\gason</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\native\ext\sha1\sha1.cpp">
-      <Filter>ext\sha1</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\native\net\websocket_server.cpp">
       <Filter>net</Filter>
     </ClCompile>
@@ -622,42 +376,6 @@
     <ClInclude Include="..\..\ext\native\i18n\i18n.h">
       <Filter>i18n</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libzip\config.h">
-      <Filter>ext\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libzip\zip.h">
-      <Filter>ext\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libzip\zipint.h">
-      <Filter>ext\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libpng17\png.h">
-      <Filter>ext\libpng17</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libpng17\pngconf.h">
-      <Filter>ext\libpng17</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libpng17\pngdebug.h">
-      <Filter>ext\libpng17</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libpng17\pnginfo.h">
-      <Filter>ext\libpng17</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libpng17\pnglibconf.h">
-      <Filter>ext\libpng17</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libpng17\pngpriv.h">
-      <Filter>ext\libpng17</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\libpng17\pngstruct.h">
-      <Filter>ext\libpng17</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\jpge\jpgd.h">
-      <Filter>ext\jpge</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\jpge\jpge.h">
-      <Filter>ext\jpge</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\native\gfx_es2\draw_text.h">
       <Filter>gfx</Filter>
     </ClInclude>
@@ -667,12 +385,6 @@
     <ClInclude Include="..\..\ext\native\image\zim_load.h">
       <Filter>image</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\cityhash\city.h">
-      <Filter>ext\cityhash</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\cityhash\citycrc.h">
-      <Filter>ext\cityhash</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\native\gfx_es2\gpu_features.h">
       <Filter>gfx</Filter>
     </ClInclude>
@@ -681,12 +393,6 @@
     </ClInclude>
     <ClInclude Include="..\..\ext\native\json\json_reader.h" />
     <ClInclude Include="..\..\ext\native\json\json_writer.h" />
-    <ClInclude Include="..\..\ext\native\ext\gason\gason.h">
-      <Filter>ext\gason</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\native\ext\sha1\sha1.h">
-      <Filter>ext\sha1</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\native\net\websocket_server.h">
       <Filter>net</Filter>
     </ClInclude>
@@ -697,4 +403,4 @@
       <Filter>gfx</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

UWP/UI_UWP/UI_UWP.vcxproj

@@ -204,7 +204,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -219,7 +219,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -234,7 +234,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>GOLD;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -249,7 +249,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -264,7 +264,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -279,7 +279,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -294,7 +294,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -309,7 +309,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>GOLD;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -324,7 +324,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>GOLD;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -339,7 +339,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -354,7 +354,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -369,7 +369,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>GOLD;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
     </ClCompile>
     <Link>

Windows/PPSSPP.sln

@@ -16,6 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPSSPPWindows", "PPSSPP.vcx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\Common.vcxproj", "{3FCDBAE2-5103-4350-9A8E-848CE9C73195}"
 	ProjectSection(ProjectDependencies) = postProject
+		{F761046E-6C38-4428-A5F1-38391A37BB34} = {F761046E-6C38-4428-A5F1-38391A37BB34}
 		{C4DF647E-80EA-4111-A0A8-218B1B711E18} = {C4DF647E-80EA-4111-A0A8-218B1B711E18}
 	EndProjectSection
 EndProject

Windows/W32Util/Misc.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "ppsspp_config.h"
 #include "CommonWindows.h"
 

android/ab.sh

@@ -5,4 +5,4 @@ cp ../assets/langregion.ini assets/langregion.ini
 cp ../assets/compat.ini assets/compat.ini
 cp ../assets/Roboto-Condensed.ttf assets/Roboto-Condensed.ttf
 cp ../assets/*.png assets/
-NDK_MODULE_PATH=../ext:../ext/native/ext $NDK/ndk-build -j3 $*
+NDK_MODULE_PATH=../ext $NDK/ndk-build -j3 $*

android/custom_rules.xml

@@ -7,13 +7,13 @@
     <target name="-pre-build">
         <exec executable="${ndk.dir}/${ndkbuild_exe}" failonerror="true">
             <arg line="-j4 ${ndkbuildopt}"/>
-            <env key="NDK_MODULE_PATH" path="../ext:../ext/native/ext"/>
+            <env key="NDK_MODULE_PATH" path="../ext"/>
         </exec>
     </target>
     <target name="clean" depends="android_rules.clean">
         <exec executable="${ndk.dir}/${ndkbuild_exe}" failonerror="true">
             <arg value="clean"/>
-            <env key="NDK_MODULE_PATH" path="../ext:../ext/native/ext"/>
+            <env key="NDK_MODULE_PATH" path="../ext"/>
         </exec>
     </target>
 </project>

android/jni/Android.mk

@@ -156,11 +156,55 @@ SPIRV_CROSS_FILES := \
   $(SRC)/ext/SPIRV-Cross/spirv_parser.cpp \
   $(SRC)/ext/SPIRV-Cross/spirv_cross_parsed_ir.cpp
 
+EXT_FILES := \
+  $(SRC)/ext/cityhash/city.cpp \
+  $(SRC)/ext/libpng17/png.c \
+  $(SRC)/ext/libpng17/pngerror.c \
+  $(SRC)/ext/libpng17/pngget.c \
+  $(SRC)/ext/libpng17/pngmem.c \
+  $(SRC)/ext/libpng17/pngpread.c \
+  $(SRC)/ext/libpng17/pngread.c \
+  $(SRC)/ext/libpng17/pngrio.c \
+  $(SRC)/ext/libpng17/pngrtran.c \
+  $(SRC)/ext/libpng17/pngrutil.c \
+  $(SRC)/ext/libpng17/pngset.c \
+  $(SRC)/ext/libpng17/pngtest.c \
+  $(SRC)/ext/libpng17/pngtrans.c \
+  $(SRC)/ext/libpng17/pngwio.c \
+  $(SRC)/ext/libpng17/pngwrite.c \
+  $(SRC)/ext/libpng17/pngwtran.c \
+  $(SRC)/ext/libpng17/pngwutil.c \
+  $(SRC)/ext/jpge/jpgd.cpp \
+  $(SRC)/ext/jpge/jpge.cpp \
+  $(SRC)/ext/sha1/sha1.cpp \
+  $(SRC)/ext/gason/gason.cpp \
+  $(SRC)/ext/libkirk/AES.c \
+  $(SRC)/ext/libkirk/amctrl.c \
+  $(SRC)/ext/libkirk/SHA1.c \
+  $(SRC)/ext/libkirk/bn.c \
+  $(SRC)/ext/libkirk/ec.c \
+  $(SRC)/ext/libkirk/kirk_engine.c \
+  $(SRC)/ext/sfmt19937/SFMT.c \
+  $(SRC)/ext/snappy/snappy-c.cpp \
+  $(SRC)/ext/snappy/snappy-sinksource.cpp \
+  $(SRC)/ext/snappy/snappy-stubs-internal.cpp \
+  $(SRC)/ext/snappy/snappy.cpp \
+  $(SRC)/ext/udis86/decode.c \
+  $(SRC)/ext/udis86/itab.c \
+  $(SRC)/ext/udis86/syn-att.c \
+  $(SRC)/ext/udis86/syn-intel.c \
+  $(SRC)/ext/udis86/syn.c \
+  $(SRC)/ext/udis86/udis86.c \
+  $(SRC)/ext/xbrz/xbrz.cpp \
+  $(SRC)/ext/xxhash.c \
+
+
 EXEC_AND_LIB_FILES := \
   $(ARCH_FILES) \
   $(EGL_FILES) \
   $(VULKAN_FILES) \
   $(SPIRV_CROSS_FILES) \
+  $(EXT_FILES) \
   TestRunner.cpp \
   $(SRC)/Core/MIPS/MIPS.cpp.arm \
   $(SRC)/Core/MIPS/MIPSAnalyst.cpp \
@@ -185,25 +229,6 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Core/MIPS/IR/IRInterpreter.cpp \
   $(SRC)/Core/MIPS/IR/IRPassSimplify.cpp \
   $(SRC)/Core/MIPS/IR/IRRegCache.cpp \
-  $(SRC)/ext/libkirk/AES.c \
-  $(SRC)/ext/libkirk/amctrl.c \
-  $(SRC)/ext/libkirk/SHA1.c \
-  $(SRC)/ext/libkirk/bn.c \
-  $(SRC)/ext/libkirk/ec.c \
-  $(SRC)/ext/libkirk/kirk_engine.c \
-  $(SRC)/ext/sfmt19937/SFMT.c \
-  $(SRC)/ext/snappy/snappy-c.cpp \
-  $(SRC)/ext/snappy/snappy-sinksource.cpp \
-  $(SRC)/ext/snappy/snappy-stubs-internal.cpp \
-  $(SRC)/ext/snappy/snappy.cpp \
-  $(SRC)/ext/udis86/decode.c \
-  $(SRC)/ext/udis86/itab.c \
-  $(SRC)/ext/udis86/syn-att.c \
-  $(SRC)/ext/udis86/syn-intel.c \
-  $(SRC)/ext/udis86/syn.c \
-  $(SRC)/ext/udis86/udis86.c \
-  $(SRC)/ext/xbrz/xbrz.cpp \
-  $(SRC)/ext/xxhash.c \
   $(SRC)/Common/Buffer.cpp \
   $(SRC)/Common/Crypto/md5.cpp \
   $(SRC)/Common/Crypto/sha1.cpp \