From 65617889dd2ece7047ecfe89a86d4b7bdea7a28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 29 Sep 2020 23:59:05 +0200 Subject: [PATCH 1/5] Merge ext/native/ext/... directly into ext. --- .ycm_extra_conf.py | 2 +- CMakeLists.txt | 189 +- Common/Common.vcxproj | 221 +- Common/Common.vcxproj.filters | 82 +- Common/stdafx.cpp | 11 - Common/stdafx.h | 42 - Core/Core.vcxproj | 92 +- Core/Core.vcxproj.filters | 239 ++ Core/MIPS/MIPSAsm.cpp | 3 - UI/UI.vcxproj | 18 +- UWP/CommonUWP/CommonUWP.vcxproj | 93 +- UWP/CommonUWP/CommonUWP.vcxproj.filters | 98 +- UWP/CoreUWP/CoreUWP.vcxproj | 2091 ++++++++++++++++- UWP/CoreUWP/CoreUWP.vcxproj.filters | 215 ++ UWP/GPU_UWP/GPU_UWP.vcxproj | 24 +- UWP/NativeUWP/NativeUWP.vcxproj | 1013 +------- UWP/NativeUWP/NativeUWP.vcxproj.filters | 296 +-- UWP/UI_UWP/UI_UWP.vcxproj | 24 +- Windows/PPSSPP.sln | 1 + Windows/W32Util/Misc.cpp | 1 - android/ab.sh | 2 +- android/custom_rules.xml | 4 +- android/jni/Android.mk | 63 +- ext/{native/ext => }/cityhash/COPYING | 0 ext/{native/ext => }/cityhash/README | 0 ext/{native/ext => }/cityhash/city.cpp | 0 ext/{native/ext => }/cityhash/city.h | 0 ext/{native/ext => }/cityhash/citycrc.h | 0 ext/{native/ext => }/gason/LICENSE | 0 ext/{native/ext => }/gason/gason.cpp | 0 ext/{native/ext => }/gason/gason.h | 0 ext/{native/ext => }/jpge/jpgd.cpp | 0 ext/{native/ext => }/jpge/jpgd.h | 0 ext/{native/ext => }/jpge/jpge.cpp | 0 ext/{native/ext => }/jpge/jpge.h | 0 ext/{native/ext => }/jpge/publicdomain.txt | 0 ext/{native/ext => }/libpng17/CMakeLists.txt | 0 ext/{native/ext => }/libpng17/png.c | 0 ext/{native/ext => }/libpng17/png.h | 0 ext/{native/ext => }/libpng17/pngconf.h | 0 ext/{native/ext => }/libpng17/pngdebug.h | 0 ext/{native/ext => }/libpng17/pngerror.c | 0 ext/{native/ext => }/libpng17/pngget.c | 0 ext/{native/ext => }/libpng17/pnginfo.h | 0 ext/{native/ext => }/libpng17/pnglibconf.h | 0 ext/{native/ext => }/libpng17/pngmem.c | 0 ext/{native/ext => }/libpng17/pngpread.c | 0 ext/{native/ext => }/libpng17/pngpriv.h | 0 ext/{native/ext => }/libpng17/pngread.c | 0 ext/{native/ext => }/libpng17/pngrio.c | 0 ext/{native/ext => }/libpng17/pngrtran.c | 0 ext/{native/ext => }/libpng17/pngrutil.c | 0 ext/{native/ext => }/libpng17/pngset.c | 0 ext/{native/ext => }/libpng17/pngstruct.h | 0 ext/{native/ext => }/libpng17/pngtest.c | 0 ext/{native/ext => }/libpng17/pngtrans.c | 0 ext/{native/ext => }/libpng17/pngwio.c | 0 ext/{native/ext => }/libpng17/pngwrite.c | 0 ext/{native/ext => }/libpng17/pngwtran.c | 0 ext/{native/ext => }/libpng17/pngwutil.c | 0 ext/{native/ext => }/libzip/Android.mk | 0 ext/{native/ext => }/libzip/CMakeLists.txt | 0 ext/{native/ext => }/libzip/config.h | 0 ext/{native/ext => }/libzip/libzip.la | 0 ext/{native/ext => }/libzip/mkstemp.c | 0 ext/{native/ext => }/libzip/zip.h | 0 ext/{native/ext => }/libzip/zip_add.c | 0 ext/{native/ext => }/libzip/zip_add_dir.c | 0 ext/{native/ext => }/libzip/zip_close.c | 0 ext/{native/ext => }/libzip/zip_delete.c | 0 ext/{native/ext => }/libzip/zip_dirent.c | 0 ext/{native/ext => }/libzip/zip_entry_free.c | 0 ext/{native/ext => }/libzip/zip_entry_new.c | 0 ext/{native/ext => }/libzip/zip_err_str.c | 0 ext/{native/ext => }/libzip/zip_error.c | 0 ext/{native/ext => }/libzip/zip_error_clear.c | 0 ext/{native/ext => }/libzip/zip_error_get.c | 0 .../ext => }/libzip/zip_error_get_sys_type.c | 0 .../ext => }/libzip/zip_error_strerror.c | 0 .../ext => }/libzip/zip_error_to_str.c | 0 ext/{native/ext => }/libzip/zip_fclose.c | 0 .../ext => }/libzip/zip_file_error_clear.c | 0 .../ext => }/libzip/zip_file_error_get.c | 0 .../ext => }/libzip/zip_file_get_offset.c | 0 .../ext => }/libzip/zip_file_strerror.c | 0 .../ext => }/libzip/zip_filerange_crc.c | 0 ext/{native/ext => }/libzip/zip_fopen.c | 0 ext/{native/ext => }/libzip/zip_fopen_index.c | 0 ext/{native/ext => }/libzip/zip_fread.c | 0 ext/{native/ext => }/libzip/zip_free.c | 0 .../ext => }/libzip/zip_get_archive_comment.c | 0 .../ext => }/libzip/zip_get_archive_flag.c | 0 .../ext => }/libzip/zip_get_file_comment.c | 0 ext/{native/ext => }/libzip/zip_get_name.c | 0 .../ext => }/libzip/zip_get_num_files.c | 0 ext/{native/ext => }/libzip/zip_memdup.c | 0 ext/{native/ext => }/libzip/zip_name_locate.c | 0 ext/{native/ext => }/libzip/zip_new.c | 0 ext/{native/ext => }/libzip/zip_open.c | 0 ext/{native/ext => }/libzip/zip_rename.c | 0 ext/{native/ext => }/libzip/zip_replace.c | 0 .../ext => }/libzip/zip_set_archive_comment.c | 0 .../ext => }/libzip/zip_set_archive_flag.c | 0 .../ext => }/libzip/zip_set_file_comment.c | 0 ext/{native/ext => }/libzip/zip_set_name.c | 0 .../ext => }/libzip/zip_source_buffer.c | 0 ext/{native/ext => }/libzip/zip_source_file.c | 0 .../ext => }/libzip/zip_source_filep.c | 0 ext/{native/ext => }/libzip/zip_source_free.c | 0 .../ext => }/libzip/zip_source_function.c | 0 ext/{native/ext => }/libzip/zip_source_zip.c | 0 ext/{native/ext => }/libzip/zip_stat.c | 0 ext/{native/ext => }/libzip/zip_stat_index.c | 0 ext/{native/ext => }/libzip/zip_stat_init.c | 0 ext/{native/ext => }/libzip/zip_strerror.c | 0 ext/{native/ext => }/libzip/zip_unchange.c | 0 .../ext => }/libzip/zip_unchange_all.c | 0 .../ext => }/libzip/zip_unchange_archive.c | 0 .../ext => }/libzip/zip_unchange_data.c | 0 ext/{native/ext => }/libzip/zipint.h | 0 ext/native/Android.mk | 21 - ext/native/ext/libpng17/arm/arm_init.c | 133 -- ext/native/ext/libpng17/arm/filter_neon.S | 246 -- .../ext/libpng17/arm/filter_neon_intrinsics.c | 376 --- ext/native/native.vcxproj | 637 +---- ext/native/native.vcxproj.filters | 291 --- ext/native/tools/atlastool.cpp | 2 +- ext/{native/ext => }/sha1/CMakeLists.txt | 0 ext/{native/ext => }/sha1/sha1.cpp | 0 ext/{native/ext => }/sha1/sha1.h | 0 libretro/Makefile.common | 162 +- 131 files changed, 3297 insertions(+), 3395 deletions(-) delete mode 100644 Common/stdafx.cpp delete mode 100644 Common/stdafx.h rename ext/{native/ext => }/cityhash/COPYING (100%) rename ext/{native/ext => }/cityhash/README (100%) rename ext/{native/ext => }/cityhash/city.cpp (100%) rename ext/{native/ext => }/cityhash/city.h (100%) rename ext/{native/ext => }/cityhash/citycrc.h (100%) rename ext/{native/ext => }/gason/LICENSE (100%) rename ext/{native/ext => }/gason/gason.cpp (100%) rename ext/{native/ext => }/gason/gason.h (100%) rename ext/{native/ext => }/jpge/jpgd.cpp (100%) rename ext/{native/ext => }/jpge/jpgd.h (100%) rename ext/{native/ext => }/jpge/jpge.cpp (100%) rename ext/{native/ext => }/jpge/jpge.h (100%) rename ext/{native/ext => }/jpge/publicdomain.txt (100%) rename ext/{native/ext => }/libpng17/CMakeLists.txt (100%) rename ext/{native/ext => }/libpng17/png.c (100%) rename ext/{native/ext => }/libpng17/png.h (100%) rename ext/{native/ext => }/libpng17/pngconf.h (100%) rename ext/{native/ext => }/libpng17/pngdebug.h (100%) rename ext/{native/ext => }/libpng17/pngerror.c (100%) rename ext/{native/ext => }/libpng17/pngget.c (100%) rename ext/{native/ext => }/libpng17/pnginfo.h (100%) rename ext/{native/ext => }/libpng17/pnglibconf.h (100%) rename ext/{native/ext => }/libpng17/pngmem.c (100%) rename ext/{native/ext => }/libpng17/pngpread.c (100%) rename ext/{native/ext => }/libpng17/pngpriv.h (100%) rename ext/{native/ext => }/libpng17/pngread.c (100%) rename ext/{native/ext => }/libpng17/pngrio.c (100%) rename ext/{native/ext => }/libpng17/pngrtran.c (100%) rename ext/{native/ext => }/libpng17/pngrutil.c (100%) rename ext/{native/ext => }/libpng17/pngset.c (100%) rename ext/{native/ext => }/libpng17/pngstruct.h (100%) rename ext/{native/ext => }/libpng17/pngtest.c (100%) rename ext/{native/ext => }/libpng17/pngtrans.c (100%) rename ext/{native/ext => }/libpng17/pngwio.c (100%) rename ext/{native/ext => }/libpng17/pngwrite.c (100%) rename ext/{native/ext => }/libpng17/pngwtran.c (100%) rename ext/{native/ext => }/libpng17/pngwutil.c (100%) rename ext/{native/ext => }/libzip/Android.mk (100%) rename ext/{native/ext => }/libzip/CMakeLists.txt (100%) rename ext/{native/ext => }/libzip/config.h (100%) rename ext/{native/ext => }/libzip/libzip.la (100%) rename ext/{native/ext => }/libzip/mkstemp.c (100%) rename ext/{native/ext => }/libzip/zip.h (100%) rename ext/{native/ext => }/libzip/zip_add.c (100%) rename ext/{native/ext => }/libzip/zip_add_dir.c (100%) rename ext/{native/ext => }/libzip/zip_close.c (100%) rename ext/{native/ext => }/libzip/zip_delete.c (100%) rename ext/{native/ext => }/libzip/zip_dirent.c (100%) rename ext/{native/ext => }/libzip/zip_entry_free.c (100%) rename ext/{native/ext => }/libzip/zip_entry_new.c (100%) rename ext/{native/ext => }/libzip/zip_err_str.c (100%) rename ext/{native/ext => }/libzip/zip_error.c (100%) rename ext/{native/ext => }/libzip/zip_error_clear.c (100%) rename ext/{native/ext => }/libzip/zip_error_get.c (100%) rename ext/{native/ext => }/libzip/zip_error_get_sys_type.c (100%) rename ext/{native/ext => }/libzip/zip_error_strerror.c (100%) rename ext/{native/ext => }/libzip/zip_error_to_str.c (100%) rename ext/{native/ext => }/libzip/zip_fclose.c (100%) rename ext/{native/ext => }/libzip/zip_file_error_clear.c (100%) rename ext/{native/ext => }/libzip/zip_file_error_get.c (100%) rename ext/{native/ext => }/libzip/zip_file_get_offset.c (100%) rename ext/{native/ext => }/libzip/zip_file_strerror.c (100%) rename ext/{native/ext => }/libzip/zip_filerange_crc.c (100%) rename ext/{native/ext => }/libzip/zip_fopen.c (100%) rename ext/{native/ext => }/libzip/zip_fopen_index.c (100%) rename ext/{native/ext => }/libzip/zip_fread.c (100%) rename ext/{native/ext => }/libzip/zip_free.c (100%) rename ext/{native/ext => }/libzip/zip_get_archive_comment.c (100%) rename ext/{native/ext => }/libzip/zip_get_archive_flag.c (100%) rename ext/{native/ext => }/libzip/zip_get_file_comment.c (100%) rename ext/{native/ext => }/libzip/zip_get_name.c (100%) rename ext/{native/ext => }/libzip/zip_get_num_files.c (100%) rename ext/{native/ext => }/libzip/zip_memdup.c (100%) rename ext/{native/ext => }/libzip/zip_name_locate.c (100%) rename ext/{native/ext => }/libzip/zip_new.c (100%) rename ext/{native/ext => }/libzip/zip_open.c (100%) rename ext/{native/ext => }/libzip/zip_rename.c (100%) rename ext/{native/ext => }/libzip/zip_replace.c (100%) rename ext/{native/ext => }/libzip/zip_set_archive_comment.c (100%) rename ext/{native/ext => }/libzip/zip_set_archive_flag.c (100%) rename ext/{native/ext => }/libzip/zip_set_file_comment.c (100%) rename ext/{native/ext => }/libzip/zip_set_name.c (100%) rename ext/{native/ext => }/libzip/zip_source_buffer.c (100%) rename ext/{native/ext => }/libzip/zip_source_file.c (100%) rename ext/{native/ext => }/libzip/zip_source_filep.c (100%) rename ext/{native/ext => }/libzip/zip_source_free.c (100%) rename ext/{native/ext => }/libzip/zip_source_function.c (100%) rename ext/{native/ext => }/libzip/zip_source_zip.c (100%) rename ext/{native/ext => }/libzip/zip_stat.c (100%) rename ext/{native/ext => }/libzip/zip_stat_index.c (100%) rename ext/{native/ext => }/libzip/zip_stat_init.c (100%) rename ext/{native/ext => }/libzip/zip_strerror.c (100%) rename ext/{native/ext => }/libzip/zip_unchange.c (100%) rename ext/{native/ext => }/libzip/zip_unchange_all.c (100%) rename ext/{native/ext => }/libzip/zip_unchange_archive.c (100%) rename ext/{native/ext => }/libzip/zip_unchange_data.c (100%) rename ext/{native/ext => }/libzip/zipint.h (100%) delete mode 100644 ext/native/ext/libpng17/arm/arm_init.c delete mode 100644 ext/native/ext/libpng17/arm/filter_neon.S delete mode 100644 ext/native/ext/libpng17/arm/filter_neon_intrinsics.c rename ext/{native/ext => }/sha1/CMakeLists.txt (100%) rename ext/{native/ext => }/sha1/sha1.cpp (100%) rename ext/{native/ext => }/sha1/sha1.h (100%) diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py index cbda75bb1f..67405088b5 100644 --- a/.ycm_extra_conf.py +++ b/.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=" flag, clang won't know which diff --git a/CMakeLists.txt b/CMakeLists.txt index 12f85e629d..c323f8885b 100644 --- a/CMakeLists.txt +++ b/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/native/ext/gason/gason.h + ext/gason/gason.cpp + ext/gason/gason.h ) if(USE_FFMPEG) @@ -610,9 +603,9 @@ else() endif() add_library(cityhash STATIC - ext/native/ext/cityhash/city.cpp - ext/native/ext/cityhash/city.h - ext/native/ext/cityhash/citycrc.h + ext/cityhash/city.cpp + ext/cityhash/city.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/native/ext/libzip/mkstemp.c - ext/native/ext/libzip/zip_add.c - ext/native/ext/libzip/zip_add_dir.c - ext/native/ext/libzip/zip_close.c - ext/native/ext/libzip/zip_delete.c - ext/native/ext/libzip/zip_dirent.c - ext/native/ext/libzip/zip_entry_free.c - ext/native/ext/libzip/zip_entry_new.c - ext/native/ext/libzip/zip_err_str.c - ext/native/ext/libzip/zip_error.c - ext/native/ext/libzip/zip_error_clear.c - ext/native/ext/libzip/zip_error_get.c - ext/native/ext/libzip/zip_error_get_sys_type.c - ext/native/ext/libzip/zip_error_strerror.c - ext/native/ext/libzip/zip_error_to_str.c - ext/native/ext/libzip/zip_fclose.c - ext/native/ext/libzip/zip_file_error_clear.c - ext/native/ext/libzip/zip_file_error_get.c - ext/native/ext/libzip/zip_file_get_offset.c - ext/native/ext/libzip/zip_file_strerror.c - ext/native/ext/libzip/zip_filerange_crc.c - ext/native/ext/libzip/zip_fopen.c - ext/native/ext/libzip/zip_fopen_index.c - ext/native/ext/libzip/zip_fread.c - ext/native/ext/libzip/zip_free.c - ext/native/ext/libzip/zip_get_archive_comment.c - ext/native/ext/libzip/zip_get_archive_flag.c - ext/native/ext/libzip/zip_get_file_comment.c - ext/native/ext/libzip/zip_get_name.c - ext/native/ext/libzip/zip_get_num_files.c - ext/native/ext/libzip/zip_memdup.c - ext/native/ext/libzip/zip_name_locate.c - ext/native/ext/libzip/zip_new.c - ext/native/ext/libzip/zip_open.c - ext/native/ext/libzip/zip_rename.c - ext/native/ext/libzip/zip_replace.c - ext/native/ext/libzip/zip_set_archive_comment.c - ext/native/ext/libzip/zip_set_archive_flag.c - ext/native/ext/libzip/zip_set_file_comment.c - ext/native/ext/libzip/zip_set_name.c - ext/native/ext/libzip/zip_source_buffer.c - ext/native/ext/libzip/zip_source_file.c - ext/native/ext/libzip/zip_source_filep.c - ext/native/ext/libzip/zip_source_free.c - ext/native/ext/libzip/zip_source_function.c - ext/native/ext/libzip/zip_source_zip.c - ext/native/ext/libzip/zip_stat.c - ext/native/ext/libzip/zip_stat_index.c - ext/native/ext/libzip/zip_stat_init.c - ext/native/ext/libzip/zip_strerror.c - ext/native/ext/libzip/zip_unchange.c - ext/native/ext/libzip/zip_unchange_all.c - ext/native/ext/libzip/zip_unchange_archive.c - ext/native/ext/libzip/zip_unchange_data.c + ext/libzip/zip.h + ext/libzip/mkstemp.c + ext/libzip/zip_add.c + ext/libzip/zip_add_dir.c + ext/libzip/zip_close.c + ext/libzip/zip_delete.c + ext/libzip/zip_dirent.c + ext/libzip/zip_entry_free.c + ext/libzip/zip_entry_new.c + ext/libzip/zip_err_str.c + ext/libzip/zip_error.c + ext/libzip/zip_error_clear.c + ext/libzip/zip_error_get.c + ext/libzip/zip_error_get_sys_type.c + ext/libzip/zip_error_strerror.c + ext/libzip/zip_error_to_str.c + ext/libzip/zip_fclose.c + ext/libzip/zip_file_error_clear.c + ext/libzip/zip_file_error_get.c + ext/libzip/zip_file_get_offset.c + ext/libzip/zip_file_strerror.c + ext/libzip/zip_filerange_crc.c + ext/libzip/zip_fopen.c + ext/libzip/zip_fopen_index.c + ext/libzip/zip_fread.c + ext/libzip/zip_free.c + ext/libzip/zip_get_archive_comment.c + ext/libzip/zip_get_archive_flag.c + ext/libzip/zip_get_file_comment.c + ext/libzip/zip_get_name.c + ext/libzip/zip_get_num_files.c + ext/libzip/zip_memdup.c + ext/libzip/zip_name_locate.c + ext/libzip/zip_new.c + ext/libzip/zip_open.c + ext/libzip/zip_rename.c + ext/libzip/zip_replace.c + ext/libzip/zip_set_archive_comment.c + ext/libzip/zip_set_archive_flag.c + ext/libzip/zip_set_file_comment.c + ext/libzip/zip_set_name.c + ext/libzip/zip_source_buffer.c + ext/libzip/zip_source_file.c + ext/libzip/zip_source_filep.c + ext/libzip/zip_source_free.c + ext/libzip/zip_source_function.c + ext/libzip/zip_source_zip.c + ext/libzip/zip_stat.c + ext/libzip/zip_stat_index.c + ext/libzip/zip_stat_init.c + ext/libzip/zip_strerror.c + ext/libzip/zip_unchange.c + ext/libzip/zip_unchange_all.c + ext/libzip/zip_unchange_archive.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/native/ext/libpng17/arm/filter_neon.S - ext/native/ext/libpng17/arm/filter_neon_intrinsics.c + ext/libpng17/arm/arm_init.c + ext/libpng17/arm/filter_neon.S + ext/libpng17/arm/filter_neon_intrinsics.c ) endif() add_library(png17 STATIC - ext/native/ext/libpng17/pngconf.h - ext/native/ext/libpng17/pngdebug.h - ext/native/ext/libpng17/png.c - ext/native/ext/libpng17/png.h - ext/native/ext/libpng17/pngerror.c - ext/native/ext/libpng17/pngget.c - ext/native/ext/libpng17/pnginfo.h - ext/native/ext/libpng17/pnglibconf.h - ext/native/ext/libpng17/pngmem.c - ext/native/ext/libpng17/pngpread.c - ext/native/ext/libpng17/pngpriv.h - ext/native/ext/libpng17/pngread.c - ext/native/ext/libpng17/pngrio.c - ext/native/ext/libpng17/pngrtran.c - ext/native/ext/libpng17/pngrutil.c - ext/native/ext/libpng17/pngset.c - ext/native/ext/libpng17/pngstruct.h - ext/native/ext/libpng17/pngtrans.c - ext/native/ext/libpng17/pngwio.c - ext/native/ext/libpng17/pngwrite.c - ext/native/ext/libpng17/pngwtran.c - ext/native/ext/libpng17/pngwutil.c + ext/libpng17/pngconf.h + ext/libpng17/pngdebug.h + ext/libpng17/png.c + ext/libpng17/png.h + ext/libpng17/pngerror.c + ext/libpng17/pngget.c + ext/libpng17/pnginfo.h + ext/libpng17/pnglibconf.h + ext/libpng17/pngmem.c + ext/libpng17/pngpread.c + ext/libpng17/pngpriv.h + ext/libpng17/pngread.c + ext/libpng17/pngrio.c + ext/libpng17/pngrtran.c + ext/libpng17/pngrutil.c + ext/libpng17/pngset.c + ext/libpng17/pngstruct.h + ext/libpng17/pngtrans.c + ext/libpng17/pngwio.c + ext/libpng17/pngwrite.c + ext/libpng17/pngwtran.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/native/ext/jpge/jpgd.h - ext/native/ext/jpge/jpge.cpp - ext/native/ext/jpge/jpge.h + ext/jpge/jpgd.cpp + ext/jpge/jpgd.h + ext/jpge/jpge.cpp + ext/jpge/jpge.h ) include_directories(ext/native) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 94af9b6ce9..aceea2b7fc 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -132,12 +132,11 @@ - Use Level3 _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdafx.h;Common/DbgNew.h + Common/DbgNew.h MultiThreadedDebug - ../ext/native;../ext/snappy;../ext/glslang;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. StreamingSIMDExtensions2 Precise true @@ -155,12 +154,11 @@ - Use Level3 - stdafx.h;Common/DbgNew.h + Common/DbgNew.h MultiThreadedDebug _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. NotSet Precise false @@ -179,12 +177,11 @@ - Use Level3 - stdafx.h;Common/DbgNew.h + Common/DbgNew.h MultiThreadedDebug _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. NotSet Precise false @@ -203,12 +200,12 @@ - Use Level3 - stdafx.h + + MultiThreadedDebug _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. NotSet Precise false @@ -228,16 +225,16 @@ Level3 - Use MaxSpeed true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdafx.h + + false StreamingSIMDExtensions2 Precise - ../ext/native;../ext/snappy;../ext/glslang;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. Speed true false @@ -257,13 +254,13 @@ Level3 - Use MaxSpeed true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdafx.h - ../ext/native;../ext/snappy;../ext/glslang;.. + + + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. false NotSet Precise @@ -288,13 +285,13 @@ Level3 - Use MaxSpeed true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdafx.h - ../ext/native;../ext/snappy;../ext/glslang;.. + + + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. false NotSet Precise @@ -319,13 +316,13 @@ Level3 - Use MaxSpeed true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdafx.h - ../ext/native;../ext/snappy;../ext/glslang;.. + + + ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. false NotSet Precise @@ -348,6 +345,13 @@ + + + + + + + @@ -411,7 +415,6 @@ - @@ -429,6 +432,157 @@ + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + @@ -503,16 +657,6 @@ - - Create - Create - Create - Create - Create - Create - Create - Create - @@ -527,8 +671,11 @@ - - {c4df647e-80ea-4111-a0a8-218b1b711e18} + + + + + {f761046e-6c38-4428-a5f1-38391a37bb34} diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 4f8646bace..1322c5858d 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -1,7 +1,6 @@  - @@ -96,9 +95,29 @@ + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + - @@ -164,6 +183,54 @@ + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + @@ -181,5 +248,16 @@ {7be79ad5-3520-46a1-a370-dce2a943978c} + + {b2685193-5954-4ab6-af7c-d6064f63e278} + + + {1d04f87f-73a2-4027-a6ff-e998e92e7d3c} + + + + + ext\libpng17 + diff --git a/Common/stdafx.cpp b/Common/stdafx.cpp deleted file mode 100644 index 0348c60f8d..0000000000 --- a/Common/stdafx.cpp +++ /dev/null @@ -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 diff --git a/Common/stdafx.h b/Common/stdafx.h deleted file mode 100644 index 1f18c24ec4..0000000000 --- a/Common/stdafx.h +++ /dev/null @@ -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 -#include -#endif diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 22276dc688..d1cb94b914 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -138,7 +138,7 @@ Level3 - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext _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) StreamingSIMDExtensions2 Precise @@ -161,7 +161,7 @@ Level3 - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext _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) NotSet Precise @@ -185,7 +185,7 @@ Level3 - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) NotSet Precise @@ -209,7 +209,7 @@ Level3 - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) NotSet Precise @@ -237,7 +237,7 @@ MaxSpeed true true - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext false StreamingSIMDExtensions2 Precise @@ -268,7 +268,7 @@ MaxSpeed true true - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext NotSet Precise false @@ -299,7 +299,7 @@ MaxSpeed true true - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext NotSet Precise false @@ -330,7 +330,7 @@ MaxSpeed true true - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/native/ext/libpng17;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/libpng17;../ext/zlib;../ext NotSet Precise false @@ -356,8 +356,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -885,11 +944,20 @@ + + + + + + + + + @@ -1197,6 +1265,10 @@ + + + + @@ -1220,6 +1292,10 @@ {f761046e-6c38-4428-a5f1-38391a37bb34} + + + + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index b9c3ce66be..611c164009 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -73,6 +73,21 @@ {c21d9bb5-614d-451b-8c0b-3078b29122d8} + + {db010645-6b26-41a7-8d44-c53cb0533d7d} + + + {cf1a59fe-8509-48f0-84d0-27c71cb10dc3} + + + {d8c48d88-2e34-4a98-aa88-4277a3b8afea} + + + {6c6e0188-fabf-4203-aaa2-896c42be2c20} + + + {0201ff27-4fa8-4cf3-bbb9-accfdc0c7046} + @@ -767,6 +782,183 @@ Ext\Snappy + + Ext\gason + + + Ext\city + + + Ext\sha1 + + + Ext\jpge + + + Ext\jpge + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + @@ -1418,10 +1610,57 @@ HLE + + Ext\gason + + + Ext\city + + + Ext\city + + + Ext\sha1 + + + Ext\jpge + + + Ext\jpge + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\gason + + + Ext\city + + + Ext\city + + + Ext\libzip + + + + + Ext\sha1 + + + Ext\libzip + \ No newline at end of file diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp index 37914016e6..a6ed1261ac 100644 --- a/Core/MIPS/MIPSAsm.cpp +++ b/Core/MIPS/MIPSAsm.cpp @@ -1,6 +1,3 @@ -#ifdef _WIN32 -#include "stdafx.h" -#endif #include #include #include diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 132b9b9640..8c621c2f4e 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -207,7 +207,7 @@ Level3 _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext true false false @@ -227,7 +227,7 @@ Level3 _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext true false false @@ -248,7 +248,7 @@ Level3 _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext true false false @@ -269,7 +269,7 @@ Level3 _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext true false false @@ -294,7 +294,7 @@ true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext false Size true @@ -319,7 +319,7 @@ true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext false true false @@ -346,7 +346,7 @@ true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext false true false @@ -373,7 +373,7 @@ true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext false true false @@ -394,4 +394,4 @@ - \ No newline at end of file + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index f4c80840cd..3febada63d 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -200,12 +200,12 @@ - Use false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) + NotUsing Console @@ -215,12 +215,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h + NotUsing Console @@ -230,12 +230,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h + NotUsing Console @@ -245,12 +245,12 @@ - Use false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) + NotUsing Console @@ -260,12 +260,12 @@ - Use false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) + NotUsing Console @@ -275,12 +275,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h + NotUsing Console @@ -290,12 +290,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h + NotUsing Console @@ -305,12 +305,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h + NotUsing Console @@ -320,12 +320,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h + NotUsing Console @@ -335,12 +335,12 @@ - Use false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) + NotUsing Console @@ -350,12 +350,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h + NotUsing Console @@ -365,12 +365,12 @@ - Use false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h + NotUsing Console @@ -417,7 +417,6 @@ - @@ -428,7 +427,13 @@ - + + + + + + + @@ -459,7 +464,6 @@ - @@ -467,22 +471,27 @@ - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index a4cbb48402..8df0d99656 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -4,9 +4,14 @@ {da855697-f7aa-49bf-b969-7a90c5b4d259} + + {c2303262-a4f0-4400-8dd7-35ad6ac5f443} + + + {b0ac485c-3153-4708-b098-f5a518a95b79} + - @@ -30,7 +35,6 @@ - @@ -47,9 +51,57 @@ Crypto + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + - @@ -58,11 +110,6 @@ - - - - - @@ -85,7 +132,6 @@ - @@ -105,5 +151,37 @@ Crypto + + + + + + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + + + ext\libpng17 + - + + + ext\libpng17 + + + \ No newline at end of file diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index 166da83a30..a860f0886c 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -204,7 +204,7 @@ false true pch.h - ../../ffmpeg/Windows10/x86/include;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/x86/include;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -219,7 +219,7 @@ false true pch.h - ../../ffmpeg/Windows10/x86/include;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/x86/include;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -234,7 +234,7 @@ false true pch.h - ../../ffmpeg/Windows10/x86/include;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/x86/include;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -249,7 +249,7 @@ false true pch.h - ../../ffmpeg/Windows10/ARM/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/ARM/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -264,7 +264,7 @@ false true pch.h - ../../ffmpeg/Windows10/ARM64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/ARM64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -279,7 +279,7 @@ false true pch.h - ../../ffmpeg/Windows10/ARM/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/ARM/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -294,7 +294,7 @@ false true pch.h - ../../ffmpeg/Windows10/ARM64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/ARM64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -309,7 +309,7 @@ false true pch.h - ../../ffmpeg/Windows10/ARM/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/ARM/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -324,7 +324,7 @@ false true pch.h - ../../ffmpeg/Windows10/ARM64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/ARM64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -339,7 +339,7 @@ false true pch.h - ../../ffmpeg/Windows10/x64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/x64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -354,7 +354,7 @@ false true pch.h - ../../ffmpeg/Windows10/x64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/x64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -369,7 +369,7 @@ false true pch.h - ../../ffmpeg/Windows10/x64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/native/ext/libpng17;../../Common;../../ext/zlib;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../../ffmpeg/Windows10/x64/include;../../ffmpeg/WindowsInclude;../..;../../ext/native;../../ext/snappy;../../ext/libpng17;../../Common;../../ext/zlib;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) USE_FFMPEG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -576,7 +576,15 @@ + + + + + + + + @@ -819,7 +827,2063 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing NotUsing @@ -960,6 +3024,9 @@ {d31fd4f0-53eb-477c-9dc7-149796f628e2} + + + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 944ccc3509..8283fb162e 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -71,6 +71,18 @@ {3b1039f9-72dc-4c7f-bd4e-25791be20df7} + + {613b4e2e-264b-4ae8-9b23-bc15590ffa11} + + + {e20f358f-a614-47ff-a5b7-164c82e613a9} + + + {69359915-04ac-4d1f-a7ba-25b282c26ae9} + + + {1ad7ee67-c496-4709-bf98-cad322fe5d97} + @@ -724,6 +736,180 @@ Util + + Ext\gason + + + Ext\cityhash + + + Ext\jpge + + + Ext\jpge + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + @@ -1330,5 +1516,34 @@ Util + + Ext\gason + + + Ext\cityhash + + + Ext\cityhash + + + Ext\jpge + + + Ext\jpge + + + Ext\libzip + + + Ext\libzip + + + Ext\libzip + + + + + Ext\gason + \ No newline at end of file diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj b/UWP/GPU_UWP/GPU_UWP.vcxproj index 248d1c6a2b..be5fdc1a1f 100644 --- a/UWP/GPU_UWP/GPU_UWP.vcxproj +++ b/UWP/GPU_UWP/GPU_UWP.vcxproj @@ -204,7 +204,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -219,7 +219,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -234,7 +234,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -249,7 +249,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -264,7 +264,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -279,7 +279,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -294,7 +294,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -309,7 +309,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -324,7 +324,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -339,7 +339,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -354,7 +354,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -369,7 +369,7 @@ false true pch.h - ../..;../../ext/snappy;../../ext/native;../../Common;../../ext/native/ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/snappy;../../ext/native;../../Common;../../ext;../../ext/glslang;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index ae64fb1ea7..54654bc7cc 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -204,7 +204,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -219,7 +219,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -234,7 +234,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -249,7 +249,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -264,7 +264,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -279,7 +279,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -294,7 +294,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -309,7 +309,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -324,7 +324,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -339,7 +339,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -354,7 +354,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -369,7 +369,7 @@ false true pch.h - ../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;../../ext/native/ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -384,22 +384,6 @@ - - - - - - - - - - - - - - - - @@ -467,977 +451,6 @@ - - - - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing - - @@ -1625,4 +638,4 @@ - + \ No newline at end of file diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index e9dfd60c68..7b5e91cae6 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -34,33 +34,12 @@ {a522f449-7873-4af7-908e-7cc91eb8bfc0} - - {2be24387-0b6a-4253-97fa-b8b6f75a8a4c} - - - {1a486fc4-bac0-4b33-9139-262272690c74} - - - {f3b2701a-3ddc-4604-a867-2ee9a0600dab} - - - {34445680-c1be-4aec-a716-1e118ef48906} - {96ac6deb-ad00-4ee4-9f0d-515d78d1886b} - - {3ffe0470-9652-4d89-a3d1-7eb989d266ab} - {4d23e7d3-0b9b-4dbe-95df-6ab250782a66} - - {fb517d8e-e6c4-4eaf-a579-9970daa96541} - - - {b68fe6a0-b55f-4411-91f4-63ab1eaf47a3} - @@ -202,219 +181,6 @@ i18n - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\jpge - - - ext\jpge - gfx @@ -424,29 +190,17 @@ image - - ext\cityhash - gfx data - - base - math - - ext\gason - - - ext\sha1 - net @@ -622,42 +376,6 @@ i18n - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\jpge - - - ext\jpge - gfx @@ -667,12 +385,6 @@ image - - ext\cityhash - - - ext\cityhash - gfx @@ -681,12 +393,6 @@ - - ext\gason - - - ext\sha1 - net @@ -697,4 +403,4 @@ gfx - + \ No newline at end of file diff --git a/UWP/UI_UWP/UI_UWP.vcxproj b/UWP/UI_UWP/UI_UWP.vcxproj index 9db7ab4ac7..dd4037f7e0 100644 --- a/UWP/UI_UWP/UI_UWP.vcxproj +++ b/UWP/UI_UWP/UI_UWP.vcxproj @@ -204,7 +204,7 @@ false true NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -219,7 +219,7 @@ false true NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -234,7 +234,7 @@ false true GOLD;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -249,7 +249,7 @@ false true NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -264,7 +264,7 @@ false true NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -279,7 +279,7 @@ false true NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -294,7 +294,7 @@ false true NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -309,7 +309,7 @@ false true GOLD;NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -324,7 +324,7 @@ false true GOLD;NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -339,7 +339,7 @@ false true NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -354,7 +354,7 @@ false true NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h @@ -369,7 +369,7 @@ false true GOLD;NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../..;../../ext/native;../../Common;../../ext/native/ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../Common;../../ext;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) pch.h diff --git a/Windows/PPSSPP.sln b/Windows/PPSSPP.sln index a0bacf19db..942e26be29 100644 --- a/Windows/PPSSPP.sln +++ b/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 diff --git a/Windows/W32Util/Misc.cpp b/Windows/W32Util/Misc.cpp index aa3e9e432b..b4544d08a9 100644 --- a/Windows/W32Util/Misc.cpp +++ b/Windows/W32Util/Misc.cpp @@ -1,4 +1,3 @@ -#include "stdafx.h" #include "ppsspp_config.h" #include "CommonWindows.h" diff --git a/android/ab.sh b/android/ab.sh index 25ed476eb2..08520d1a28 100755 --- a/android/ab.sh +++ b/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 $* diff --git a/android/custom_rules.xml b/android/custom_rules.xml index e7edd4ff7e..292a376101 100644 --- a/android/custom_rules.xml +++ b/android/custom_rules.xml @@ -7,13 +7,13 @@ - + - + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 71b73e9c60..4e5d42436a 100644 --- a/android/jni/Android.mk +++ b/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 \ diff --git a/ext/native/ext/cityhash/COPYING b/ext/cityhash/COPYING similarity index 100% rename from ext/native/ext/cityhash/COPYING rename to ext/cityhash/COPYING diff --git a/ext/native/ext/cityhash/README b/ext/cityhash/README similarity index 100% rename from ext/native/ext/cityhash/README rename to ext/cityhash/README diff --git a/ext/native/ext/cityhash/city.cpp b/ext/cityhash/city.cpp similarity index 100% rename from ext/native/ext/cityhash/city.cpp rename to ext/cityhash/city.cpp diff --git a/ext/native/ext/cityhash/city.h b/ext/cityhash/city.h similarity index 100% rename from ext/native/ext/cityhash/city.h rename to ext/cityhash/city.h diff --git a/ext/native/ext/cityhash/citycrc.h b/ext/cityhash/citycrc.h similarity index 100% rename from ext/native/ext/cityhash/citycrc.h rename to ext/cityhash/citycrc.h diff --git a/ext/native/ext/gason/LICENSE b/ext/gason/LICENSE similarity index 100% rename from ext/native/ext/gason/LICENSE rename to ext/gason/LICENSE diff --git a/ext/native/ext/gason/gason.cpp b/ext/gason/gason.cpp similarity index 100% rename from ext/native/ext/gason/gason.cpp rename to ext/gason/gason.cpp diff --git a/ext/native/ext/gason/gason.h b/ext/gason/gason.h similarity index 100% rename from ext/native/ext/gason/gason.h rename to ext/gason/gason.h diff --git a/ext/native/ext/jpge/jpgd.cpp b/ext/jpge/jpgd.cpp similarity index 100% rename from ext/native/ext/jpge/jpgd.cpp rename to ext/jpge/jpgd.cpp diff --git a/ext/native/ext/jpge/jpgd.h b/ext/jpge/jpgd.h similarity index 100% rename from ext/native/ext/jpge/jpgd.h rename to ext/jpge/jpgd.h diff --git a/ext/native/ext/jpge/jpge.cpp b/ext/jpge/jpge.cpp similarity index 100% rename from ext/native/ext/jpge/jpge.cpp rename to ext/jpge/jpge.cpp diff --git a/ext/native/ext/jpge/jpge.h b/ext/jpge/jpge.h similarity index 100% rename from ext/native/ext/jpge/jpge.h rename to ext/jpge/jpge.h diff --git a/ext/native/ext/jpge/publicdomain.txt b/ext/jpge/publicdomain.txt similarity index 100% rename from ext/native/ext/jpge/publicdomain.txt rename to ext/jpge/publicdomain.txt diff --git a/ext/native/ext/libpng17/CMakeLists.txt b/ext/libpng17/CMakeLists.txt similarity index 100% rename from ext/native/ext/libpng17/CMakeLists.txt rename to ext/libpng17/CMakeLists.txt diff --git a/ext/native/ext/libpng17/png.c b/ext/libpng17/png.c similarity index 100% rename from ext/native/ext/libpng17/png.c rename to ext/libpng17/png.c diff --git a/ext/native/ext/libpng17/png.h b/ext/libpng17/png.h similarity index 100% rename from ext/native/ext/libpng17/png.h rename to ext/libpng17/png.h diff --git a/ext/native/ext/libpng17/pngconf.h b/ext/libpng17/pngconf.h similarity index 100% rename from ext/native/ext/libpng17/pngconf.h rename to ext/libpng17/pngconf.h diff --git a/ext/native/ext/libpng17/pngdebug.h b/ext/libpng17/pngdebug.h similarity index 100% rename from ext/native/ext/libpng17/pngdebug.h rename to ext/libpng17/pngdebug.h diff --git a/ext/native/ext/libpng17/pngerror.c b/ext/libpng17/pngerror.c similarity index 100% rename from ext/native/ext/libpng17/pngerror.c rename to ext/libpng17/pngerror.c diff --git a/ext/native/ext/libpng17/pngget.c b/ext/libpng17/pngget.c similarity index 100% rename from ext/native/ext/libpng17/pngget.c rename to ext/libpng17/pngget.c diff --git a/ext/native/ext/libpng17/pnginfo.h b/ext/libpng17/pnginfo.h similarity index 100% rename from ext/native/ext/libpng17/pnginfo.h rename to ext/libpng17/pnginfo.h diff --git a/ext/native/ext/libpng17/pnglibconf.h b/ext/libpng17/pnglibconf.h similarity index 100% rename from ext/native/ext/libpng17/pnglibconf.h rename to ext/libpng17/pnglibconf.h diff --git a/ext/native/ext/libpng17/pngmem.c b/ext/libpng17/pngmem.c similarity index 100% rename from ext/native/ext/libpng17/pngmem.c rename to ext/libpng17/pngmem.c diff --git a/ext/native/ext/libpng17/pngpread.c b/ext/libpng17/pngpread.c similarity index 100% rename from ext/native/ext/libpng17/pngpread.c rename to ext/libpng17/pngpread.c diff --git a/ext/native/ext/libpng17/pngpriv.h b/ext/libpng17/pngpriv.h similarity index 100% rename from ext/native/ext/libpng17/pngpriv.h rename to ext/libpng17/pngpriv.h diff --git a/ext/native/ext/libpng17/pngread.c b/ext/libpng17/pngread.c similarity index 100% rename from ext/native/ext/libpng17/pngread.c rename to ext/libpng17/pngread.c diff --git a/ext/native/ext/libpng17/pngrio.c b/ext/libpng17/pngrio.c similarity index 100% rename from ext/native/ext/libpng17/pngrio.c rename to ext/libpng17/pngrio.c diff --git a/ext/native/ext/libpng17/pngrtran.c b/ext/libpng17/pngrtran.c similarity index 100% rename from ext/native/ext/libpng17/pngrtran.c rename to ext/libpng17/pngrtran.c diff --git a/ext/native/ext/libpng17/pngrutil.c b/ext/libpng17/pngrutil.c similarity index 100% rename from ext/native/ext/libpng17/pngrutil.c rename to ext/libpng17/pngrutil.c diff --git a/ext/native/ext/libpng17/pngset.c b/ext/libpng17/pngset.c similarity index 100% rename from ext/native/ext/libpng17/pngset.c rename to ext/libpng17/pngset.c diff --git a/ext/native/ext/libpng17/pngstruct.h b/ext/libpng17/pngstruct.h similarity index 100% rename from ext/native/ext/libpng17/pngstruct.h rename to ext/libpng17/pngstruct.h diff --git a/ext/native/ext/libpng17/pngtest.c b/ext/libpng17/pngtest.c similarity index 100% rename from ext/native/ext/libpng17/pngtest.c rename to ext/libpng17/pngtest.c diff --git a/ext/native/ext/libpng17/pngtrans.c b/ext/libpng17/pngtrans.c similarity index 100% rename from ext/native/ext/libpng17/pngtrans.c rename to ext/libpng17/pngtrans.c diff --git a/ext/native/ext/libpng17/pngwio.c b/ext/libpng17/pngwio.c similarity index 100% rename from ext/native/ext/libpng17/pngwio.c rename to ext/libpng17/pngwio.c diff --git a/ext/native/ext/libpng17/pngwrite.c b/ext/libpng17/pngwrite.c similarity index 100% rename from ext/native/ext/libpng17/pngwrite.c rename to ext/libpng17/pngwrite.c diff --git a/ext/native/ext/libpng17/pngwtran.c b/ext/libpng17/pngwtran.c similarity index 100% rename from ext/native/ext/libpng17/pngwtran.c rename to ext/libpng17/pngwtran.c diff --git a/ext/native/ext/libpng17/pngwutil.c b/ext/libpng17/pngwutil.c similarity index 100% rename from ext/native/ext/libpng17/pngwutil.c rename to ext/libpng17/pngwutil.c diff --git a/ext/native/ext/libzip/Android.mk b/ext/libzip/Android.mk similarity index 100% rename from ext/native/ext/libzip/Android.mk rename to ext/libzip/Android.mk diff --git a/ext/native/ext/libzip/CMakeLists.txt b/ext/libzip/CMakeLists.txt similarity index 100% rename from ext/native/ext/libzip/CMakeLists.txt rename to ext/libzip/CMakeLists.txt diff --git a/ext/native/ext/libzip/config.h b/ext/libzip/config.h similarity index 100% rename from ext/native/ext/libzip/config.h rename to ext/libzip/config.h diff --git a/ext/native/ext/libzip/libzip.la b/ext/libzip/libzip.la similarity index 100% rename from ext/native/ext/libzip/libzip.la rename to ext/libzip/libzip.la diff --git a/ext/native/ext/libzip/mkstemp.c b/ext/libzip/mkstemp.c similarity index 100% rename from ext/native/ext/libzip/mkstemp.c rename to ext/libzip/mkstemp.c diff --git a/ext/native/ext/libzip/zip.h b/ext/libzip/zip.h similarity index 100% rename from ext/native/ext/libzip/zip.h rename to ext/libzip/zip.h diff --git a/ext/native/ext/libzip/zip_add.c b/ext/libzip/zip_add.c similarity index 100% rename from ext/native/ext/libzip/zip_add.c rename to ext/libzip/zip_add.c diff --git a/ext/native/ext/libzip/zip_add_dir.c b/ext/libzip/zip_add_dir.c similarity index 100% rename from ext/native/ext/libzip/zip_add_dir.c rename to ext/libzip/zip_add_dir.c diff --git a/ext/native/ext/libzip/zip_close.c b/ext/libzip/zip_close.c similarity index 100% rename from ext/native/ext/libzip/zip_close.c rename to ext/libzip/zip_close.c diff --git a/ext/native/ext/libzip/zip_delete.c b/ext/libzip/zip_delete.c similarity index 100% rename from ext/native/ext/libzip/zip_delete.c rename to ext/libzip/zip_delete.c diff --git a/ext/native/ext/libzip/zip_dirent.c b/ext/libzip/zip_dirent.c similarity index 100% rename from ext/native/ext/libzip/zip_dirent.c rename to ext/libzip/zip_dirent.c diff --git a/ext/native/ext/libzip/zip_entry_free.c b/ext/libzip/zip_entry_free.c similarity index 100% rename from ext/native/ext/libzip/zip_entry_free.c rename to ext/libzip/zip_entry_free.c diff --git a/ext/native/ext/libzip/zip_entry_new.c b/ext/libzip/zip_entry_new.c similarity index 100% rename from ext/native/ext/libzip/zip_entry_new.c rename to ext/libzip/zip_entry_new.c diff --git a/ext/native/ext/libzip/zip_err_str.c b/ext/libzip/zip_err_str.c similarity index 100% rename from ext/native/ext/libzip/zip_err_str.c rename to ext/libzip/zip_err_str.c diff --git a/ext/native/ext/libzip/zip_error.c b/ext/libzip/zip_error.c similarity index 100% rename from ext/native/ext/libzip/zip_error.c rename to ext/libzip/zip_error.c diff --git a/ext/native/ext/libzip/zip_error_clear.c b/ext/libzip/zip_error_clear.c similarity index 100% rename from ext/native/ext/libzip/zip_error_clear.c rename to ext/libzip/zip_error_clear.c diff --git a/ext/native/ext/libzip/zip_error_get.c b/ext/libzip/zip_error_get.c similarity index 100% rename from ext/native/ext/libzip/zip_error_get.c rename to ext/libzip/zip_error_get.c diff --git a/ext/native/ext/libzip/zip_error_get_sys_type.c b/ext/libzip/zip_error_get_sys_type.c similarity index 100% rename from ext/native/ext/libzip/zip_error_get_sys_type.c rename to ext/libzip/zip_error_get_sys_type.c diff --git a/ext/native/ext/libzip/zip_error_strerror.c b/ext/libzip/zip_error_strerror.c similarity index 100% rename from ext/native/ext/libzip/zip_error_strerror.c rename to ext/libzip/zip_error_strerror.c diff --git a/ext/native/ext/libzip/zip_error_to_str.c b/ext/libzip/zip_error_to_str.c similarity index 100% rename from ext/native/ext/libzip/zip_error_to_str.c rename to ext/libzip/zip_error_to_str.c diff --git a/ext/native/ext/libzip/zip_fclose.c b/ext/libzip/zip_fclose.c similarity index 100% rename from ext/native/ext/libzip/zip_fclose.c rename to ext/libzip/zip_fclose.c diff --git a/ext/native/ext/libzip/zip_file_error_clear.c b/ext/libzip/zip_file_error_clear.c similarity index 100% rename from ext/native/ext/libzip/zip_file_error_clear.c rename to ext/libzip/zip_file_error_clear.c diff --git a/ext/native/ext/libzip/zip_file_error_get.c b/ext/libzip/zip_file_error_get.c similarity index 100% rename from ext/native/ext/libzip/zip_file_error_get.c rename to ext/libzip/zip_file_error_get.c diff --git a/ext/native/ext/libzip/zip_file_get_offset.c b/ext/libzip/zip_file_get_offset.c similarity index 100% rename from ext/native/ext/libzip/zip_file_get_offset.c rename to ext/libzip/zip_file_get_offset.c diff --git a/ext/native/ext/libzip/zip_file_strerror.c b/ext/libzip/zip_file_strerror.c similarity index 100% rename from ext/native/ext/libzip/zip_file_strerror.c rename to ext/libzip/zip_file_strerror.c diff --git a/ext/native/ext/libzip/zip_filerange_crc.c b/ext/libzip/zip_filerange_crc.c similarity index 100% rename from ext/native/ext/libzip/zip_filerange_crc.c rename to ext/libzip/zip_filerange_crc.c diff --git a/ext/native/ext/libzip/zip_fopen.c b/ext/libzip/zip_fopen.c similarity index 100% rename from ext/native/ext/libzip/zip_fopen.c rename to ext/libzip/zip_fopen.c diff --git a/ext/native/ext/libzip/zip_fopen_index.c b/ext/libzip/zip_fopen_index.c similarity index 100% rename from ext/native/ext/libzip/zip_fopen_index.c rename to ext/libzip/zip_fopen_index.c diff --git a/ext/native/ext/libzip/zip_fread.c b/ext/libzip/zip_fread.c similarity index 100% rename from ext/native/ext/libzip/zip_fread.c rename to ext/libzip/zip_fread.c diff --git a/ext/native/ext/libzip/zip_free.c b/ext/libzip/zip_free.c similarity index 100% rename from ext/native/ext/libzip/zip_free.c rename to ext/libzip/zip_free.c diff --git a/ext/native/ext/libzip/zip_get_archive_comment.c b/ext/libzip/zip_get_archive_comment.c similarity index 100% rename from ext/native/ext/libzip/zip_get_archive_comment.c rename to ext/libzip/zip_get_archive_comment.c diff --git a/ext/native/ext/libzip/zip_get_archive_flag.c b/ext/libzip/zip_get_archive_flag.c similarity index 100% rename from ext/native/ext/libzip/zip_get_archive_flag.c rename to ext/libzip/zip_get_archive_flag.c diff --git a/ext/native/ext/libzip/zip_get_file_comment.c b/ext/libzip/zip_get_file_comment.c similarity index 100% rename from ext/native/ext/libzip/zip_get_file_comment.c rename to ext/libzip/zip_get_file_comment.c diff --git a/ext/native/ext/libzip/zip_get_name.c b/ext/libzip/zip_get_name.c similarity index 100% rename from ext/native/ext/libzip/zip_get_name.c rename to ext/libzip/zip_get_name.c diff --git a/ext/native/ext/libzip/zip_get_num_files.c b/ext/libzip/zip_get_num_files.c similarity index 100% rename from ext/native/ext/libzip/zip_get_num_files.c rename to ext/libzip/zip_get_num_files.c diff --git a/ext/native/ext/libzip/zip_memdup.c b/ext/libzip/zip_memdup.c similarity index 100% rename from ext/native/ext/libzip/zip_memdup.c rename to ext/libzip/zip_memdup.c diff --git a/ext/native/ext/libzip/zip_name_locate.c b/ext/libzip/zip_name_locate.c similarity index 100% rename from ext/native/ext/libzip/zip_name_locate.c rename to ext/libzip/zip_name_locate.c diff --git a/ext/native/ext/libzip/zip_new.c b/ext/libzip/zip_new.c similarity index 100% rename from ext/native/ext/libzip/zip_new.c rename to ext/libzip/zip_new.c diff --git a/ext/native/ext/libzip/zip_open.c b/ext/libzip/zip_open.c similarity index 100% rename from ext/native/ext/libzip/zip_open.c rename to ext/libzip/zip_open.c diff --git a/ext/native/ext/libzip/zip_rename.c b/ext/libzip/zip_rename.c similarity index 100% rename from ext/native/ext/libzip/zip_rename.c rename to ext/libzip/zip_rename.c diff --git a/ext/native/ext/libzip/zip_replace.c b/ext/libzip/zip_replace.c similarity index 100% rename from ext/native/ext/libzip/zip_replace.c rename to ext/libzip/zip_replace.c diff --git a/ext/native/ext/libzip/zip_set_archive_comment.c b/ext/libzip/zip_set_archive_comment.c similarity index 100% rename from ext/native/ext/libzip/zip_set_archive_comment.c rename to ext/libzip/zip_set_archive_comment.c diff --git a/ext/native/ext/libzip/zip_set_archive_flag.c b/ext/libzip/zip_set_archive_flag.c similarity index 100% rename from ext/native/ext/libzip/zip_set_archive_flag.c rename to ext/libzip/zip_set_archive_flag.c diff --git a/ext/native/ext/libzip/zip_set_file_comment.c b/ext/libzip/zip_set_file_comment.c similarity index 100% rename from ext/native/ext/libzip/zip_set_file_comment.c rename to ext/libzip/zip_set_file_comment.c diff --git a/ext/native/ext/libzip/zip_set_name.c b/ext/libzip/zip_set_name.c similarity index 100% rename from ext/native/ext/libzip/zip_set_name.c rename to ext/libzip/zip_set_name.c diff --git a/ext/native/ext/libzip/zip_source_buffer.c b/ext/libzip/zip_source_buffer.c similarity index 100% rename from ext/native/ext/libzip/zip_source_buffer.c rename to ext/libzip/zip_source_buffer.c diff --git a/ext/native/ext/libzip/zip_source_file.c b/ext/libzip/zip_source_file.c similarity index 100% rename from ext/native/ext/libzip/zip_source_file.c rename to ext/libzip/zip_source_file.c diff --git a/ext/native/ext/libzip/zip_source_filep.c b/ext/libzip/zip_source_filep.c similarity index 100% rename from ext/native/ext/libzip/zip_source_filep.c rename to ext/libzip/zip_source_filep.c diff --git a/ext/native/ext/libzip/zip_source_free.c b/ext/libzip/zip_source_free.c similarity index 100% rename from ext/native/ext/libzip/zip_source_free.c rename to ext/libzip/zip_source_free.c diff --git a/ext/native/ext/libzip/zip_source_function.c b/ext/libzip/zip_source_function.c similarity index 100% rename from ext/native/ext/libzip/zip_source_function.c rename to ext/libzip/zip_source_function.c diff --git a/ext/native/ext/libzip/zip_source_zip.c b/ext/libzip/zip_source_zip.c similarity index 100% rename from ext/native/ext/libzip/zip_source_zip.c rename to ext/libzip/zip_source_zip.c diff --git a/ext/native/ext/libzip/zip_stat.c b/ext/libzip/zip_stat.c similarity index 100% rename from ext/native/ext/libzip/zip_stat.c rename to ext/libzip/zip_stat.c diff --git a/ext/native/ext/libzip/zip_stat_index.c b/ext/libzip/zip_stat_index.c similarity index 100% rename from ext/native/ext/libzip/zip_stat_index.c rename to ext/libzip/zip_stat_index.c diff --git a/ext/native/ext/libzip/zip_stat_init.c b/ext/libzip/zip_stat_init.c similarity index 100% rename from ext/native/ext/libzip/zip_stat_init.c rename to ext/libzip/zip_stat_init.c diff --git a/ext/native/ext/libzip/zip_strerror.c b/ext/libzip/zip_strerror.c similarity index 100% rename from ext/native/ext/libzip/zip_strerror.c rename to ext/libzip/zip_strerror.c diff --git a/ext/native/ext/libzip/zip_unchange.c b/ext/libzip/zip_unchange.c similarity index 100% rename from ext/native/ext/libzip/zip_unchange.c rename to ext/libzip/zip_unchange.c diff --git a/ext/native/ext/libzip/zip_unchange_all.c b/ext/libzip/zip_unchange_all.c similarity index 100% rename from ext/native/ext/libzip/zip_unchange_all.c rename to ext/libzip/zip_unchange_all.c diff --git a/ext/native/ext/libzip/zip_unchange_archive.c b/ext/libzip/zip_unchange_archive.c similarity index 100% rename from ext/native/ext/libzip/zip_unchange_archive.c rename to ext/libzip/zip_unchange_archive.c diff --git a/ext/native/ext/libzip/zip_unchange_data.c b/ext/libzip/zip_unchange_data.c similarity index 100% rename from ext/native/ext/libzip/zip_unchange_data.c rename to ext/libzip/zip_unchange_data.c diff --git a/ext/native/ext/libzip/zipint.h b/ext/libzip/zipint.h similarity index 100% rename from ext/native/ext/libzip/zipint.h rename to ext/libzip/zipint.h diff --git a/ext/native/Android.mk b/ext/native/Android.mk index 754edf4b69..9248ca0d5a 100644 --- a/ext/native/Android.mk +++ b/ext/native/Android.mk @@ -11,27 +11,6 @@ LOCAL_SRC_FILES :=\ base/colorutil.cpp \ data/base64.cpp \ data/compression.cpp \ - ext/cityhash/city.cpp \ - ext/libpng17/png.c \ - ext/libpng17/pngerror.c \ - ext/libpng17/pngget.c \ - ext/libpng17/pngmem.c \ - ext/libpng17/pngpread.c \ - ext/libpng17/pngread.c \ - ext/libpng17/pngrio.c \ - ext/libpng17/pngrtran.c \ - ext/libpng17/pngrutil.c \ - ext/libpng17/pngset.c \ - ext/libpng17/pngtest.c \ - ext/libpng17/pngtrans.c \ - ext/libpng17/pngwio.c \ - ext/libpng17/pngwrite.c \ - ext/libpng17/pngwtran.c \ - ext/libpng17/pngwutil.c \ - ext/jpge/jpgd.cpp \ - ext/jpge/jpge.cpp \ - ext/sha1/sha1.cpp \ - ext/gason/gason.cpp \ file/fd_util.cpp \ file/chunk_file.cpp \ file/file_util.cpp \ diff --git a/ext/native/ext/libpng17/arm/arm_init.c b/ext/native/ext/libpng17/arm/arm_init.c deleted file mode 100644 index a672eaebb5..0000000000 --- a/ext/native/ext/libpng17/arm/arm_init.c +++ /dev/null @@ -1,133 +0,0 @@ - -/* arm_init.c - NEON optimised filter functions - * - * Copyright (c) 2014 Glenn Randers-Pehrson - * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - */ -/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are - * called. - */ -#define _POSIX_SOURCE 1 - -#include "../pngpriv.h" - -#ifdef PNG_READ_SUPPORTED -#if PNG_ARM_NEON_OPT > 0 -#ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */ -/* WARNING: it is strongly recommended that you do not build libpng with - * run-time checks for CPU features if at all possible. In the case of the ARM - * NEON instructions there is no processor-specific way of detecting the - * presence of the required support, therefore run-time detection is extremely - * OS specific. - * - * You may set the macro PNG_ARM_NEON_FILE to the file name of file containing - * a fragment of C source code which defines the png_have_neon function. There - * are a number of implementations in contrib/arm-neon, but the only one that - * has partial support is contrib/arm-neon/linux.c - a generic Linux - * implementation which reads /proc/cpufino. - */ -#ifndef PNG_ARM_NEON_FILE -# ifdef __linux__ -# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c" -# endif -#endif - -#ifdef PNG_ARM_NEON_FILE - -#include /* for sig_atomic_t */ -static int png_have_neon(png_structp png_ptr); -#include PNG_ARM_NEON_FILE - -#else /* PNG_ARM_NEON_FILE */ -# error "PNG_ARM_NEON_FILE undefined: no support for run-time ARM NEON checks" -#endif /* PNG_ARM_NEON_FILE */ -#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */ - -#ifndef PNG_ALIGNED_MEMORY_SUPPORTED -# error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED" -#endif - -void -png_init_filter_functions_neon(png_structp pp, unsigned int bpp) -{ - /* The switch statement is compiled in for ARM_NEON_API, the call to - * png_have_neon is compiled in for ARM_NEON_CHECK. If both are defined - * the check is only performed if the API has not set the NEON option on - * or off explicitly. In this case the check controls what happens. - * - * If the CHECK is not compiled in and the option is UNSET the behavior prior - * to 1.6.7 was to use the NEON code - this was a bug caused by having the - * wrong order of the 'ON' and 'default' cases. UNSET now defaults to OFF, - * as documented in png.h - */ -#ifdef PNG_ARM_NEON_API_SUPPORTED - switch ((pp->options >> PNG_ARM_NEON) & 3) - { - case PNG_OPTION_UNSET: - /* Allow the run-time check to execute if it has been enabled - - * thus both API and CHECK can be turned on. If it isn't supported - * this case will fall through to the 'default' below, which just - * returns. - */ -#endif /* PNG_ARM_NEON_API_SUPPORTED */ -#ifdef PNG_ARM_NEON_CHECK_SUPPORTED - { - static volatile sig_atomic_t no_neon = -1; /* not checked */ - - if (no_neon < 0) - no_neon = !png_have_neon(pp); - - if (no_neon) - return; - } -#ifdef PNG_ARM_NEON_API_SUPPORTED - break; -#endif -#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */ - -#ifdef PNG_ARM_NEON_API_SUPPORTED - default: /* OFF or INVALID */ - return; - - case PNG_OPTION_ON: - /* Option turned on */ - break; - } -#endif - - /* IMPORTANT: any new external functions used here must be declared using - * PNG_INTERNAL_FUNCTION in ../pngpriv.h. This is required so that the - * 'prefix' option to configure works: - * - * ./configure --with-libpng-prefix=foobar_ - * - * Verify you have got this right by running the above command, doing a build - * and examining pngprefix.h; it must contain a #define for every external - * function you add. (Notice that this happens automatically for the - * initialization function.) - */ - pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon; - - if (bpp == 3) - { - pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon; - pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon; - pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = - png_read_filter_row_paeth3_neon; - } - - else if (bpp == 4) - { - pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon; - pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon; - pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = - png_read_filter_row_paeth4_neon; - } -} -#endif /* PNG_ARM_NEON_OPT > 0 */ -#endif /* PNG_READ_SUPPORTED */ diff --git a/ext/native/ext/libpng17/arm/filter_neon.S b/ext/native/ext/libpng17/arm/filter_neon.S deleted file mode 100644 index 40d97775d6..0000000000 --- a/ext/native/ext/libpng17/arm/filter_neon.S +++ /dev/null @@ -1,246 +0,0 @@ - -/* filter_neon.S - NEON optimised filter functions - * - * Copyright (c) 2013 Glenn Randers-Pehrson - * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.8 [December 19, 2013] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - */ - -/* This is required to get the symbol renames, which are #defines, and also - * includes the definition (or not) of PNG_ARM_NEON_OPT and - * PNG_ARM_NEON_IMPLEMENTATION. - */ -#define PNG_VERSION_INFO_ONLY -#include "../pngpriv.h" - -#if defined(__linux__) && defined(__ELF__) -.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ -#endif - -/* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for - * ARM64). The code in arm/filter_neon_intrinsics.c supports ARM64, however it - * only works if -mfpu=neon is specified on the GCC command line. See pngpriv.h - * for the logic which sets PNG_USE_ARM_NEON_ASM: - */ -#if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */ - -#ifdef PNG_READ_SUPPORTED -#if PNG_ARM_NEON_OPT > 0 - -#ifdef __ELF__ -# define ELF -#else -# define ELF @ -#endif - - .arch armv7-a - .fpu neon - -.macro func name, export=0 - .macro endfunc -ELF .size \name, . - \name - .endfunc - .purgem endfunc - .endm - .text - .if \export - .global \name - .endif -ELF .type \name, STT_FUNC - .func \name -\name: -.endm - -func png_read_filter_row_sub4_neon, export=1 - ldr r3, [r0, #4] @ rowbytes - vmov.i8 d3, #0 -1: - vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] - vadd.u8 d0, d3, d4 - vadd.u8 d1, d0, d5 - vadd.u8 d2, d1, d6 - vadd.u8 d3, d2, d7 - vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! - subs r3, r3, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_sub3_neon, export=1 - ldr r3, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - mov r0, r1 - mov r2, #3 - mov r12, #12 - vld1.8 {q11}, [r0], r12 -1: - vext.8 d5, d22, d23, #3 - vadd.u8 d0, d3, d22 - vext.8 d6, d22, d23, #6 - vadd.u8 d1, d0, d5 - vext.8 d7, d23, d23, #1 - vld1.8 {q11}, [r0], r12 - vst1.32 {d0[0]}, [r1,:32], r2 - vadd.u8 d2, d1, d6 - vst1.32 {d1[0]}, [r1], r2 - vadd.u8 d3, d2, d7 - vst1.32 {d2[0]}, [r1], r2 - vst1.32 {d3[0]}, [r1], r2 - subs r3, r3, #12 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_up_neon, export=1 - ldr r3, [r0, #4] @ rowbytes -1: - vld1.8 {q0}, [r1,:128] - vld1.8 {q1}, [r2,:128]! - vadd.u8 q0, q0, q1 - vst1.8 {q0}, [r1,:128]! - subs r3, r3, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_avg4_neon, export=1 - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 -1: - vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] - vld4.32 {d16[],d17[],d18[],d19[]},[r2,:128]! - vhadd.u8 d0, d3, d16 - vadd.u8 d0, d0, d4 - vhadd.u8 d1, d0, d17 - vadd.u8 d1, d1, d5 - vhadd.u8 d2, d1, d18 - vadd.u8 d2, d2, d6 - vhadd.u8 d3, d2, d19 - vadd.u8 d3, d3, d7 - vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! - subs r12, r12, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_avg3_neon, export=1 - push {r4,lr} - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - mov r0, r1 - mov r4, #3 - mov lr, #12 - vld1.8 {q11}, [r0], lr -1: - vld1.8 {q10}, [r2], lr - vext.8 d5, d22, d23, #3 - vhadd.u8 d0, d3, d20 - vext.8 d17, d20, d21, #3 - vadd.u8 d0, d0, d22 - vext.8 d6, d22, d23, #6 - vhadd.u8 d1, d0, d17 - vext.8 d18, d20, d21, #6 - vadd.u8 d1, d1, d5 - vext.8 d7, d23, d23, #1 - vld1.8 {q11}, [r0], lr - vst1.32 {d0[0]}, [r1,:32], r4 - vhadd.u8 d2, d1, d18 - vst1.32 {d1[0]}, [r1], r4 - vext.8 d19, d21, d21, #1 - vadd.u8 d2, d2, d6 - vhadd.u8 d3, d2, d19 - vst1.32 {d2[0]}, [r1], r4 - vadd.u8 d3, d3, d7 - vst1.32 {d3[0]}, [r1], r4 - subs r12, r12, #12 - bgt 1b - - pop {r4,pc} -endfunc - -.macro paeth rx, ra, rb, rc - vaddl.u8 q12, \ra, \rb @ a + b - vaddl.u8 q15, \rc, \rc @ 2*c - vabdl.u8 q13, \rb, \rc @ pa - vabdl.u8 q14, \ra, \rc @ pb - vabd.u16 q15, q12, q15 @ pc - vcle.u16 q12, q13, q14 @ pa <= pb - vcle.u16 q13, q13, q15 @ pa <= pc - vcle.u16 q14, q14, q15 @ pb <= pc - vand q12, q12, q13 @ pa <= pb && pa <= pc - vmovn.u16 d28, q14 - vmovn.u16 \rx, q12 - vbsl d28, \rb, \rc - vbsl \rx, \ra, d28 -.endm - -func png_read_filter_row_paeth4_neon, export=1 - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - vmov.i8 d20, #0 -1: - vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] - vld4.32 {d16[],d17[],d18[],d19[]},[r2,:128]! - paeth d0, d3, d16, d20 - vadd.u8 d0, d0, d4 - paeth d1, d0, d17, d16 - vadd.u8 d1, d1, d5 - paeth d2, d1, d18, d17 - vadd.u8 d2, d2, d6 - paeth d3, d2, d19, d18 - vmov d20, d19 - vadd.u8 d3, d3, d7 - vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! - subs r12, r12, #16 - bgt 1b - - bx lr -endfunc - -func png_read_filter_row_paeth3_neon, export=1 - push {r4,lr} - ldr r12, [r0, #4] @ rowbytes - vmov.i8 d3, #0 - vmov.i8 d4, #0 - mov r0, r1 - mov r4, #3 - mov lr, #12 - vld1.8 {q11}, [r0], lr -1: - vld1.8 {q10}, [r2], lr - paeth d0, d3, d20, d4 - vext.8 d5, d22, d23, #3 - vadd.u8 d0, d0, d22 - vext.8 d17, d20, d21, #3 - paeth d1, d0, d17, d20 - vst1.32 {d0[0]}, [r1,:32], r4 - vext.8 d6, d22, d23, #6 - vadd.u8 d1, d1, d5 - vext.8 d18, d20, d21, #6 - paeth d2, d1, d18, d17 - vext.8 d7, d23, d23, #1 - vld1.8 {q11}, [r0], lr - vst1.32 {d1[0]}, [r1], r4 - vadd.u8 d2, d2, d6 - vext.8 d19, d21, d21, #1 - paeth d3, d2, d19, d18 - vst1.32 {d2[0]}, [r1], r4 - vmov d4, d19 - vadd.u8 d3, d3, d7 - vst1.32 {d3[0]}, [r1], r4 - subs r12, r12, #12 - bgt 1b - - pop {r4,pc} -endfunc -#endif /* PNG_ARM_NEON_OPT > 0 */ -#endif /* PNG_READ_SUPPORTED */ -#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 (assembler) */ diff --git a/ext/native/ext/libpng17/arm/filter_neon_intrinsics.c b/ext/native/ext/libpng17/arm/filter_neon_intrinsics.c deleted file mode 100644 index 09c2516a60..0000000000 --- a/ext/native/ext/libpng17/arm/filter_neon_intrinsics.c +++ /dev/null @@ -1,376 +0,0 @@ - -/* filter_neon_intrinsics.c - NEON optimised filter functions - * - * Copyright (c) 2013 Glenn Randers-Pehrson - * Written by James Yu , October 2013. - * Based on filter_neon.S, written by Mans Rullgard, 2011. - * - * Last changed in libpng 1.6.8 [December 19, 2013] - * - * This code is released under the libpng license. - * For conditions of distribution and use, see the disclaimer - * and license in png.h - */ - -#include "../pngpriv.h" - -/* This code requires -mfpu=neon on the command line: */ -#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ - -#if defined(_MSC_VER) && defined(_M_ARM64) -#include -#else -#include -#endif - -/* libpng row pointers are not necessarily aligned to any particular boundary, - * however this code will only work with appropriate alignment. arm/arm_init.c - * checks for this (and will not compile unless it is done). This code uses - * variants of png_aligncast to avoid compiler warnings. - */ -#define png_ptr(type,pointer) png_aligncast(type *,pointer) -#define png_ptrc(type,pointer) png_aligncastconst(const type *,pointer) - -/* The following relies on a variable 'temp_pointer' being declared with type - * 'type'. This is written this way just to hide the GCC strict aliasing - * warning; note that the code is safe because there never is an alias between - * the input and output pointers. - */ -#define png_ldr(type,pointer)\ - (temp_pointer = png_ptr(type,pointer), *temp_pointer) - -#ifdef PNG_READ_SUPPORTED -#if PNG_ARM_NEON_OPT > 0 - -void -png_read_filter_row_up_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - png_const_bytep pp = prev_row; - - for (; rp < rp_stop; rp += 16, pp += 16) - { - uint8x16_t qrp, qpp; - - qrp = vld1q_u8(rp); - qpp = vld1q_u8(pp); - qrp = vaddq_u8(qrp, qpp); - vst1q_u8(rp, qrp); - } -} - -void -png_read_filter_row_sub3_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x16_t vtmp = vld1q_u8(rp); - uint8x8x2_t *vrpt = png_ptr(uint8x8x2_t, &vtmp); - uint8x8x2_t vrp = *vrpt; - - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop;) - { - uint8x8_t vtmp1, vtmp2; - uint32x2_t *temp_pointer; - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); - vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]); - vtmp2 = vext_u8(vrp.val[0], vrp.val[1], 6); - vdest.val[1] = vadd_u8(vdest.val[0], vtmp1); - - vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); - vdest.val[2] = vadd_u8(vdest.val[1], vtmp2); - vdest.val[3] = vadd_u8(vdest.val[2], vtmp1); - - vtmp = vld1q_u8(rp + 12); - vrpt = png_ptr(uint8x8x2_t, &vtmp); - vrp = *vrpt; - - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); - rp += 3; - } - - PNG_UNUSED(prev_row) -} - -void -png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop; rp += 16) - { - uint32x2x4_t vtmp = vld4_u32(png_ptr(uint32_t,rp)); - uint8x8x4_t *vrpt = png_ptr(uint8x8x4_t,&vtmp); - uint8x8x4_t vrp = *vrpt; - uint32x2x4_t *temp_pointer; - - vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]); - vdest.val[1] = vadd_u8(vdest.val[0], vrp.val[1]); - vdest.val[2] = vadd_u8(vdest.val[1], vrp.val[2]); - vdest.val[3] = vadd_u8(vdest.val[2], vrp.val[3]); - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); - } - - PNG_UNUSED(prev_row) -} - -void -png_read_filter_row_avg3_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_const_bytep pp = prev_row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x16_t vtmp; - uint8x8x2_t *vrpt; - uint8x8x2_t vrp; - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - vtmp = vld1q_u8(rp); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - for (; rp < rp_stop; pp += 12) - { - uint8x8_t vtmp1, vtmp2, vtmp3; - - uint8x8x2_t *vppt; - uint8x8x2_t vpp; - - uint32x2_t *temp_pointer; - - vtmp = vld1q_u8(pp); - vppt = png_ptr(uint8x8x2_t,&vtmp); - vpp = *vppt; - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); - vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - - vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3); - vtmp3 = vext_u8(vrp.val[0], vrp.val[1], 6); - vdest.val[1] = vhadd_u8(vdest.val[0], vtmp2); - vdest.val[1] = vadd_u8(vdest.val[1], vtmp1); - - vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 6); - vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); - - vtmp = vld1q_u8(rp + 12); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - vdest.val[2] = vhadd_u8(vdest.val[1], vtmp2); - vdest.val[2] = vadd_u8(vdest.val[2], vtmp3); - - vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1); - - vdest.val[3] = vhadd_u8(vdest.val[2], vtmp2); - vdest.val[3] = vadd_u8(vdest.val[3], vtmp1); - - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); - rp += 3; - } -} - -void -png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - png_const_bytep pp = prev_row; - - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop; rp += 16, pp += 16) - { - uint32x2x4_t vtmp; - uint8x8x4_t *vrpt, *vppt; - uint8x8x4_t vrp, vpp; - uint32x2x4_t *temp_pointer; - - vtmp = vld4_u32(png_ptr(uint32_t,rp)); - vrpt = png_ptr(uint8x8x4_t,&vtmp); - vrp = *vrpt; - vtmp = vld4_u32(png_ptrc(uint32_t,pp)); - vppt = png_ptr(uint8x8x4_t,&vtmp); - vpp = *vppt; - - vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - vdest.val[1] = vhadd_u8(vdest.val[0], vpp.val[1]); - vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]); - vdest.val[2] = vhadd_u8(vdest.val[1], vpp.val[2]); - vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]); - vdest.val[3] = vhadd_u8(vdest.val[2], vpp.val[3]); - vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]); - - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); - } -} - -static uint8x8_t -paeth(uint8x8_t a, uint8x8_t b, uint8x8_t c) -{ - uint8x8_t d, e; - uint16x8_t p1, pa, pb, pc; - - p1 = vaddl_u8(a, b); /* a + b */ - pc = vaddl_u8(c, c); /* c * 2 */ - pa = vabdl_u8(b, c); /* pa */ - pb = vabdl_u8(a, c); /* pb */ - pc = vabdq_u16(p1, pc); /* pc */ - - p1 = vcleq_u16(pa, pb); /* pa <= pb */ - pa = vcleq_u16(pa, pc); /* pa <= pc */ - pb = vcleq_u16(pb, pc); /* pb <= pc */ - - p1 = vandq_u16(p1, pa); /* pa <= pb && pa <= pc */ - - d = vmovn_u16(pb); - e = vmovn_u16(p1); - - d = vbsl_u8(d, b, c); - e = vbsl_u8(e, a, d); - - return e; -} - -void -png_read_filter_row_paeth3_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_const_bytep pp = prev_row; - png_bytep rp_stop = row + row_info->rowbytes; - - uint8x16_t vtmp; - uint8x8x2_t *vrpt; - uint8x8x2_t vrp; - uint8x8_t vlast = vdup_n_u8(0); - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - vtmp = vld1q_u8(rp); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - for (; rp < rp_stop; pp += 12) - { - uint8x8x2_t *vppt; - uint8x8x2_t vpp; - uint8x8_t vtmp1, vtmp2, vtmp3; - uint32x2_t *temp_pointer; - - vtmp = vld1q_u8(pp); - vppt = png_ptr(uint8x8x2_t,&vtmp); - vpp = *vppt; - - vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); - vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3); - vdest.val[1] = paeth(vdest.val[0], vtmp2, vpp.val[0]); - vdest.val[1] = vadd_u8(vdest.val[1], vtmp1); - - vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 6); - vtmp3 = vext_u8(vpp.val[0], vpp.val[1], 6); - vdest.val[2] = paeth(vdest.val[1], vtmp3, vtmp2); - vdest.val[2] = vadd_u8(vdest.val[2], vtmp1); - - vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); - vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1); - - vtmp = vld1q_u8(rp + 12); - vrpt = png_ptr(uint8x8x2_t,&vtmp); - vrp = *vrpt; - - vdest.val[3] = paeth(vdest.val[2], vtmp2, vtmp3); - vdest.val[3] = vadd_u8(vdest.val[3], vtmp1); - - vlast = vtmp2; - - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); - rp += 3; - vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); - rp += 3; - } -} - -void -png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row, - png_const_bytep prev_row) -{ - png_bytep rp = row; - png_bytep rp_stop = row + row_info->rowbytes; - png_const_bytep pp = prev_row; - - uint8x8_t vlast = vdup_n_u8(0); - uint8x8x4_t vdest; - vdest.val[3] = vdup_n_u8(0); - - for (; rp < rp_stop; rp += 16, pp += 16) - { - uint32x2x4_t vtmp; - uint8x8x4_t *vrpt, *vppt; - uint8x8x4_t vrp, vpp; - uint32x2x4_t *temp_pointer; - - vtmp = vld4_u32(png_ptr(uint32_t,rp)); - vrpt = png_ptr(uint8x8x4_t,&vtmp); - vrp = *vrpt; - vtmp = vld4_u32(png_ptrc(uint32_t,pp)); - vppt = png_ptr(uint8x8x4_t,&vtmp); - vpp = *vppt; - - vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast); - vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); - vdest.val[1] = paeth(vdest.val[0], vpp.val[1], vpp.val[0]); - vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]); - vdest.val[2] = paeth(vdest.val[1], vpp.val[2], vpp.val[1]); - vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]); - vdest.val[3] = paeth(vdest.val[2], vpp.val[3], vpp.val[2]); - vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]); - - vlast = vpp.val[3]; - - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); - } -} - -#endif /* PNG_ARM_NEON_OPT > 0 */ -#endif /* PNG_READ_SUPPORTED */ -#endif /* PNG_ARM_NEON_IMPLEMENTATION == 1 (intrinsics) */ diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 275ac87058..a55298b1f6 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -156,7 +156,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -178,7 +178,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -201,7 +201,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -224,7 +224,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -251,7 +251,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) StreamingSIMDExtensions2 Precise true @@ -279,7 +279,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) NotSet Precise true @@ -309,7 +309,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) Precise true false @@ -338,7 +338,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\native\ext\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) NotSet Precise true @@ -372,8 +372,6 @@ - - @@ -387,22 +385,6 @@ - - - - - - - - - - - - - - - - @@ -507,609 +489,6 @@ - - AnySuitable - true - Speed - AnySuitable - Speed - AnySuitable - AnySuitable - AnySuitable - true - true - true - Speed - Speed - Speed - false - false - false - AnySuitable - AnySuitable - AnySuitable - Speed - Speed - Speed - false - false - false - StreamingSIMDExtensions2 - Precise - StreamingSIMDExtensions2 - StreamingSIMDExtensions2 - StreamingSIMDExtensions2 - Precise - Precise - Precise - MaxSpeed - MaxSpeed - MaxSpeed - MaxSpeed - Default - Default - Default - Default - - - - - - - - - - - - - - - - - - - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index 1542972251..059d1df547 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -9,18 +9,12 @@ base - - ext - tools ui - - ext\libzip - math\fast @@ -77,9 +71,6 @@ input - - ext - base @@ -128,12 +119,6 @@ util - - ext - - - ext - thread @@ -173,45 +158,9 @@ gfx - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libzip - - - ext\libzip - - - ext\libzip - util - - ext\jpge - - - ext\jpge - gfx @@ -305,9 +254,6 @@ thin3d - - ext\gason - json @@ -370,9 +316,6 @@ input - - ext - base @@ -418,9 +361,6 @@ util - - ext - thread @@ -463,222 +403,9 @@ util - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libpng17 - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - - - ext\libzip - util - - ext\jpge - - - ext\jpge - gfx @@ -772,9 +499,6 @@ thin3d - - ext\gason - json @@ -804,9 +528,6 @@ {f3f83007-7c3b-473f-a2f7-423c5087fbfa} - - {5c54b5e2-1bb2-4783-9df6-de4ff7105570} - {c57b41dd-cc33-46ac-b479-19676455ae54} @@ -843,23 +564,11 @@ {02e8ef95-82c7-4420-b029-a189a5e0fcbd} - - {aa8b9b49-2ff8-4961-b6cc-9c33ea674130} - - - {6c47ee5b-0375-40f0-ab2a-402d001cc9c7} - - - {3721adbc-1a4a-4017-bc1d-893c7e86bc22} - {5ce64c0e-98e4-4411-86cc-aacaf2f60b21} {06c6305a-a646-485b-85b9-645a24dd6553} - - {5b740c6f-8dbc-4529-9114-6564b37b3548} - \ No newline at end of file diff --git a/ext/native/tools/atlastool.cpp b/ext/native/tools/atlastool.cpp index 05c111f59f..4464861805 100644 --- a/ext/native/tools/atlastool.cpp +++ b/ext/native/tools/atlastool.cpp @@ -354,7 +354,7 @@ inline vector merge(const vector &a, const vector &ranges, float *metrics_height, Bucket *bucket) { - FT_Library freetype; + FT_Library freetype = 0; assert(FT_Init_FreeType(&freetype) == 0); vector fonts; diff --git a/ext/native/ext/sha1/CMakeLists.txt b/ext/sha1/CMakeLists.txt similarity index 100% rename from ext/native/ext/sha1/CMakeLists.txt rename to ext/sha1/CMakeLists.txt diff --git a/ext/native/ext/sha1/sha1.cpp b/ext/sha1/sha1.cpp similarity index 100% rename from ext/native/ext/sha1/sha1.cpp rename to ext/sha1/sha1.cpp diff --git a/ext/native/ext/sha1/sha1.h b/ext/sha1/sha1.h similarity index 100% rename from ext/native/ext/sha1/sha1.h rename to ext/sha1/sha1.h diff --git a/libretro/Makefile.common b/libretro/Makefile.common index ef385e1e5a..8d52cd110a 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -23,71 +23,71 @@ INCFLAGS += \ $(FFMPEGINCFLAGS) \ -I$(EXTDIR)/cityhash \ -I$(EXTDIR)/armips \ - -I$(NATIVEDIR)/ext \ + -I$(EXTDIR) \ -I$(NATIVEDIR) \ - -I$(NATIVEDIR)/ext/libpng17 \ + -I$(EXTDIR)/libpng17 \ -I$(EXTDIR)/libkirk \ -I$(EXTDIR)/xbrz \ -I$(EXTDIR)/xxhash \ -I$(EXTDIR)/glew ifeq ($(PLATFORM_EXT), android) - INCFLAGS += -I$(NATIVEDIR)/ext/libzip + INCFLAGS += -I$(EXTDIR)/libzip SOURCES_C += \ - $(NATIVEDIR)/ext/libzip/mkstemp.c \ - $(NATIVEDIR)/ext/libzip/zip_add.c \ - $(NATIVEDIR)/ext/libzip/zip_add_dir.c \ - $(NATIVEDIR)/ext/libzip/zip_close.c \ - $(NATIVEDIR)/ext/libzip/zip_delete.c \ - $(NATIVEDIR)/ext/libzip/zip_dirent.c \ - $(NATIVEDIR)/ext/libzip/zip_entry_free.c \ - $(NATIVEDIR)/ext/libzip/zip_entry_new.c \ - $(NATIVEDIR)/ext/libzip/zip_err_str.c \ - $(NATIVEDIR)/ext/libzip/zip_error.c \ - $(NATIVEDIR)/ext/libzip/zip_error_clear.c \ - $(NATIVEDIR)/ext/libzip/zip_error_get.c \ - $(NATIVEDIR)/ext/libzip/zip_error_get_sys_type.c \ - $(NATIVEDIR)/ext/libzip/zip_error_strerror.c \ - $(NATIVEDIR)/ext/libzip/zip_error_to_str.c \ - $(NATIVEDIR)/ext/libzip/zip_fclose.c \ - $(NATIVEDIR)/ext/libzip/zip_file_error_clear.c \ - $(NATIVEDIR)/ext/libzip/zip_file_error_get.c \ - $(NATIVEDIR)/ext/libzip/zip_file_get_offset.c \ - $(NATIVEDIR)/ext/libzip/zip_file_strerror.c \ - $(NATIVEDIR)/ext/libzip/zip_filerange_crc.c \ - $(NATIVEDIR)/ext/libzip/zip_fopen.c \ - $(NATIVEDIR)/ext/libzip/zip_fopen_index.c \ - $(NATIVEDIR)/ext/libzip/zip_fread.c \ - $(NATIVEDIR)/ext/libzip/zip_free.c \ - $(NATIVEDIR)/ext/libzip/zip_get_archive_comment.c \ - $(NATIVEDIR)/ext/libzip/zip_get_archive_flag.c \ - $(NATIVEDIR)/ext/libzip/zip_get_file_comment.c \ - $(NATIVEDIR)/ext/libzip/zip_get_name.c \ - $(NATIVEDIR)/ext/libzip/zip_get_num_files.c \ - $(NATIVEDIR)/ext/libzip/zip_memdup.c \ - $(NATIVEDIR)/ext/libzip/zip_name_locate.c \ - $(NATIVEDIR)/ext/libzip/zip_new.c \ - $(NATIVEDIR)/ext/libzip/zip_open.c \ - $(NATIVEDIR)/ext/libzip/zip_rename.c \ - $(NATIVEDIR)/ext/libzip/zip_replace.c \ - $(NATIVEDIR)/ext/libzip/zip_set_archive_comment.c \ - $(NATIVEDIR)/ext/libzip/zip_set_archive_flag.c \ - $(NATIVEDIR)/ext/libzip/zip_set_file_comment.c \ - $(NATIVEDIR)/ext/libzip/zip_set_name.c \ - $(NATIVEDIR)/ext/libzip/zip_source_buffer.c \ - $(NATIVEDIR)/ext/libzip/zip_source_file.c \ - $(NATIVEDIR)/ext/libzip/zip_source_filep.c \ - $(NATIVEDIR)/ext/libzip/zip_source_free.c \ - $(NATIVEDIR)/ext/libzip/zip_source_function.c \ - $(NATIVEDIR)/ext/libzip/zip_source_zip.c \ - $(NATIVEDIR)/ext/libzip/zip_stat.c \ - $(NATIVEDIR)/ext/libzip/zip_stat_index.c \ - $(NATIVEDIR)/ext/libzip/zip_stat_init.c \ - $(NATIVEDIR)/ext/libzip/zip_strerror.c \ - $(NATIVEDIR)/ext/libzip/zip_unchange.c \ - $(NATIVEDIR)/ext/libzip/zip_unchange_all.c \ - $(NATIVEDIR)/ext/libzip/zip_unchange_archive.c \ - $(NATIVEDIR)/ext/libzip/zip_unchange_data.c + $(EXTDIR)/libzip/mkstemp.c \ + $(EXTDIR)/libzip/zip_add.c \ + $(EXTDIR)/libzip/zip_add_dir.c \ + $(EXTDIR)/libzip/zip_close.c \ + $(EXTDIR)/libzip/zip_delete.c \ + $(EXTDIR)/libzip/zip_dirent.c \ + $(EXTDIR)/libzip/zip_entry_free.c \ + $(EXTDIR)/libzip/zip_entry_new.c \ + $(EXTDIR)/libzip/zip_err_str.c \ + $(EXTDIR)/libzip/zip_error.c \ + $(EXTDIR)/libzip/zip_error_clear.c \ + $(EXTDIR)/libzip/zip_error_get.c \ + $(EXTDIR)/libzip/zip_error_get_sys_type.c \ + $(EXTDIR)/libzip/zip_error_strerror.c \ + $(EXTDIR)/libzip/zip_error_to_str.c \ + $(EXTDIR)/libzip/zip_fclose.c \ + $(EXTDIR)/libzip/zip_file_error_clear.c \ + $(EXTDIR)/libzip/zip_file_error_get.c \ + $(EXTDIR)/libzip/zip_file_get_offset.c \ + $(EXTDIR)/libzip/zip_file_strerror.c \ + $(EXTDIR)/libzip/zip_filerange_crc.c \ + $(EXTDIR)/libzip/zip_fopen.c \ + $(EXTDIR)/libzip/zip_fopen_index.c \ + $(EXTDIR)/libzip/zip_fread.c \ + $(EXTDIR)/libzip/zip_free.c \ + $(EXTDIR)/libzip/zip_get_archive_comment.c \ + $(EXTDIR)/libzip/zip_get_archive_flag.c \ + $(EXTDIR)/libzip/zip_get_file_comment.c \ + $(EXTDIR)/libzip/zip_get_name.c \ + $(EXTDIR)/libzip/zip_get_num_files.c \ + $(EXTDIR)/libzip/zip_memdup.c \ + $(EXTDIR)/libzip/zip_name_locate.c \ + $(EXTDIR)/libzip/zip_new.c \ + $(EXTDIR)/libzip/zip_open.c \ + $(EXTDIR)/libzip/zip_rename.c \ + $(EXTDIR)/libzip/zip_replace.c \ + $(EXTDIR)/libzip/zip_set_archive_comment.c \ + $(EXTDIR)/libzip/zip_set_archive_flag.c \ + $(EXTDIR)/libzip/zip_set_file_comment.c \ + $(EXTDIR)/libzip/zip_set_name.c \ + $(EXTDIR)/libzip/zip_source_buffer.c \ + $(EXTDIR)/libzip/zip_source_file.c \ + $(EXTDIR)/libzip/zip_source_filep.c \ + $(EXTDIR)/libzip/zip_source_free.c \ + $(EXTDIR)/libzip/zip_source_function.c \ + $(EXTDIR)/libzip/zip_source_zip.c \ + $(EXTDIR)/libzip/zip_stat.c \ + $(EXTDIR)/libzip/zip_stat_index.c \ + $(EXTDIR)/libzip/zip_stat_init.c \ + $(EXTDIR)/libzip/zip_strerror.c \ + $(EXTDIR)/libzip/zip_unchange.c \ + $(EXTDIR)/libzip/zip_unchange_all.c \ + $(EXTDIR)/libzip/zip_unchange_archive.c \ + $(EXTDIR)/libzip/zip_unchange_data.c SOURCES_C +=\ $(NATIVEDIR)/gfx_es2/gl3stub.c \ @@ -106,20 +106,20 @@ SOURCES_C += \ $(EXTDIR)/libkirk/kirk_engine.c SOURCES_C += \ - $(NATIVEDIR)/ext/libpng17/png.c \ - $(NATIVEDIR)/ext/libpng17/pngerror.c \ - $(NATIVEDIR)/ext/libpng17/pngget.c \ - $(NATIVEDIR)/ext/libpng17/pngmem.c \ - $(NATIVEDIR)/ext/libpng17/pngread.c \ - $(NATIVEDIR)/ext/libpng17/pngrio.c \ - $(NATIVEDIR)/ext/libpng17/pngrtran.c \ - $(NATIVEDIR)/ext/libpng17/pngrutil.c \ - $(NATIVEDIR)/ext/libpng17/pngset.c \ - $(NATIVEDIR)/ext/libpng17/pngtrans.c \ - $(NATIVEDIR)/ext/libpng17/pngwio.c \ - $(NATIVEDIR)/ext/libpng17/pngwrite.c \ - $(NATIVEDIR)/ext/libpng17/pngwtran.c \ - $(NATIVEDIR)/ext/libpng17/pngwutil.c + $(EXTDIR)/libpng17/png.c \ + $(EXTDIR)/libpng17/pngerror.c \ + $(EXTDIR)/libpng17/pngget.c \ + $(EXTDIR)/libpng17/pngmem.c \ + $(EXTDIR)/libpng17/pngread.c \ + $(EXTDIR)/libpng17/pngrio.c \ + $(EXTDIR)/libpng17/pngrtran.c \ + $(EXTDIR)/libpng17/pngrutil.c \ + $(EXTDIR)/libpng17/pngset.c \ + $(EXTDIR)/libpng17/pngtrans.c \ + $(EXTDIR)/libpng17/pngwio.c \ + $(EXTDIR)/libpng17/pngwrite.c \ + $(EXTDIR)/libpng17/pngwtran.c \ + $(EXTDIR)/libpng17/pngwutil.c SOURCES_C += $(EXTDIR)/sfmt19937/SFMT.c SOURCES_C += $(EXTDIR)/xxhash.c @@ -133,9 +133,9 @@ SOURCES_CXX += \ SOURCES_CXX += $(EXTDIR)/xbrz/xbrz.cpp SOURCES_CXX += \ - $(NATIVEDIR)/ext/gason/gason.cpp + $(EXTDIR)/gason/gason.cpp -SOURCES_CXX += $(NATIVEDIR)/ext/cityhash/city.cpp +SOURCES_CXX += $(EXTDIR)/cityhash/city.cpp SOURCES_CXX += \ $(COMMONDIR)/Crypto/md5.cpp \ @@ -324,8 +324,8 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(NATIVEDIR)/util/text/utf8.cpp \ $(NATIVEDIR)/util/text/parsers.cpp \ $(NATIVEDIR)/util/text/wrap_text.cpp \ - $(NATIVEDIR)/ext/jpge/jpgd.cpp \ - $(NATIVEDIR)/ext/jpge/jpge.cpp \ + $(EXTDIR)/jpge/jpgd.cpp \ + $(EXTDIR)/jpge/jpge.cpp \ $(COREDIR)/AVIDump.cpp \ $(COREDIR)/Config.cpp \ $(COREDIR)/TextureReplacer.cpp \ @@ -519,10 +519,10 @@ ifeq ($(WITH_DYNAREC),1) $(COMMONDIR)/ColorConvNEON.cpp \ $(GPUDIR)/Common/TextureDecoderNEON.cpp - SOURCES_C += $(NATIVEDIR)/ext/libpng17/arm/arm_init.c \ - $(NATIVEDIR)/ext/libpng17/arm/filter_neon_intrinsics.c + SOURCES_C += $(EXTDIR)/libpng17/arm/arm_init.c \ + $(EXTDIR)/libpng17/arm/filter_neon_intrinsics.c ASMFILES += $(NATIVEDIR)/math/fast/fast_matrix_neon.S \ - $(NATIVEDIR)/ext/libpng17/arm/filter_neon.S + $(EXTDIR)/libpng17/arm/filter_neon.S endif else ifeq ($(TARGET_ARCH),arm64) DYNAFLAGS += -D_ARCH_64 @@ -549,10 +549,10 @@ ifeq ($(WITH_DYNAREC),1) $(COMMONDIR)/ColorConvNEON.cpp \ $(GPUDIR)/Common/TextureDecoderNEON.cpp - SOURCES_C += $(NATIVEDIR)/ext/libpng17/arm/arm_init.c \ - $(NATIVEDIR)/ext/libpng17/arm/filter_neon_intrinsics.c + SOURCES_C += $(EXTDIR)/libpng17/arm/arm_init.c \ + $(EXTDIR)/libpng17/arm/filter_neon_intrinsics.c ASMFILES += $(NATIVEDIR)/math/fast/fast_matrix_neon.S \ - $(NATIVEDIR)/ext/libpng17/arm/filter_neon.S + $(EXTDIR)/libpng17/arm/filter_neon.S endif else ifneq (,$(findstring msvc,$(platform))) From af57eb582cefbef65b7706e414c7cad2b58c4eb9 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 29 Sep 2020 22:41:43 -0700 Subject: [PATCH 2/5] Global: Add back arm files for libpng. --- ext/libpng17/arm/arm_init.c | 133 ++++++++ ext/libpng17/arm/filter_neon.S | 246 ++++++++++++++ ext/libpng17/arm/filter_neon_intrinsics.c | 376 ++++++++++++++++++++++ 3 files changed, 755 insertions(+) create mode 100644 ext/libpng17/arm/arm_init.c create mode 100644 ext/libpng17/arm/filter_neon.S create mode 100644 ext/libpng17/arm/filter_neon_intrinsics.c diff --git a/ext/libpng17/arm/arm_init.c b/ext/libpng17/arm/arm_init.c new file mode 100644 index 0000000000..a672eaebb5 --- /dev/null +++ b/ext/libpng17/arm/arm_init.c @@ -0,0 +1,133 @@ + +/* arm_init.c - NEON optimised filter functions + * + * Copyright (c) 2014 Glenn Randers-Pehrson + * Written by Mans Rullgard, 2011. + * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + */ +/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are + * called. + */ +#define _POSIX_SOURCE 1 + +#include "../pngpriv.h" + +#ifdef PNG_READ_SUPPORTED +#if PNG_ARM_NEON_OPT > 0 +#ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */ +/* WARNING: it is strongly recommended that you do not build libpng with + * run-time checks for CPU features if at all possible. In the case of the ARM + * NEON instructions there is no processor-specific way of detecting the + * presence of the required support, therefore run-time detection is extremely + * OS specific. + * + * You may set the macro PNG_ARM_NEON_FILE to the file name of file containing + * a fragment of C source code which defines the png_have_neon function. There + * are a number of implementations in contrib/arm-neon, but the only one that + * has partial support is contrib/arm-neon/linux.c - a generic Linux + * implementation which reads /proc/cpufino. + */ +#ifndef PNG_ARM_NEON_FILE +# ifdef __linux__ +# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c" +# endif +#endif + +#ifdef PNG_ARM_NEON_FILE + +#include /* for sig_atomic_t */ +static int png_have_neon(png_structp png_ptr); +#include PNG_ARM_NEON_FILE + +#else /* PNG_ARM_NEON_FILE */ +# error "PNG_ARM_NEON_FILE undefined: no support for run-time ARM NEON checks" +#endif /* PNG_ARM_NEON_FILE */ +#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */ + +#ifndef PNG_ALIGNED_MEMORY_SUPPORTED +# error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED" +#endif + +void +png_init_filter_functions_neon(png_structp pp, unsigned int bpp) +{ + /* The switch statement is compiled in for ARM_NEON_API, the call to + * png_have_neon is compiled in for ARM_NEON_CHECK. If both are defined + * the check is only performed if the API has not set the NEON option on + * or off explicitly. In this case the check controls what happens. + * + * If the CHECK is not compiled in and the option is UNSET the behavior prior + * to 1.6.7 was to use the NEON code - this was a bug caused by having the + * wrong order of the 'ON' and 'default' cases. UNSET now defaults to OFF, + * as documented in png.h + */ +#ifdef PNG_ARM_NEON_API_SUPPORTED + switch ((pp->options >> PNG_ARM_NEON) & 3) + { + case PNG_OPTION_UNSET: + /* Allow the run-time check to execute if it has been enabled - + * thus both API and CHECK can be turned on. If it isn't supported + * this case will fall through to the 'default' below, which just + * returns. + */ +#endif /* PNG_ARM_NEON_API_SUPPORTED */ +#ifdef PNG_ARM_NEON_CHECK_SUPPORTED + { + static volatile sig_atomic_t no_neon = -1; /* not checked */ + + if (no_neon < 0) + no_neon = !png_have_neon(pp); + + if (no_neon) + return; + } +#ifdef PNG_ARM_NEON_API_SUPPORTED + break; +#endif +#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */ + +#ifdef PNG_ARM_NEON_API_SUPPORTED + default: /* OFF or INVALID */ + return; + + case PNG_OPTION_ON: + /* Option turned on */ + break; + } +#endif + + /* IMPORTANT: any new external functions used here must be declared using + * PNG_INTERNAL_FUNCTION in ../pngpriv.h. This is required so that the + * 'prefix' option to configure works: + * + * ./configure --with-libpng-prefix=foobar_ + * + * Verify you have got this right by running the above command, doing a build + * and examining pngprefix.h; it must contain a #define for every external + * function you add. (Notice that this happens automatically for the + * initialization function.) + */ + pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon; + + if (bpp == 3) + { + pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon; + pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon; + pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = + png_read_filter_row_paeth3_neon; + } + + else if (bpp == 4) + { + pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon; + pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon; + pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = + png_read_filter_row_paeth4_neon; + } +} +#endif /* PNG_ARM_NEON_OPT > 0 */ +#endif /* PNG_READ_SUPPORTED */ diff --git a/ext/libpng17/arm/filter_neon.S b/ext/libpng17/arm/filter_neon.S new file mode 100644 index 0000000000..40d97775d6 --- /dev/null +++ b/ext/libpng17/arm/filter_neon.S @@ -0,0 +1,246 @@ + +/* filter_neon.S - NEON optimised filter functions + * + * Copyright (c) 2013 Glenn Randers-Pehrson + * Written by Mans Rullgard, 2011. + * Last changed in libpng 1.6.8 [December 19, 2013] + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + */ + +/* This is required to get the symbol renames, which are #defines, and also + * includes the definition (or not) of PNG_ARM_NEON_OPT and + * PNG_ARM_NEON_IMPLEMENTATION. + */ +#define PNG_VERSION_INFO_ONLY +#include "../pngpriv.h" + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ +#endif + +/* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for + * ARM64). The code in arm/filter_neon_intrinsics.c supports ARM64, however it + * only works if -mfpu=neon is specified on the GCC command line. See pngpriv.h + * for the logic which sets PNG_USE_ARM_NEON_ASM: + */ +#if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */ + +#ifdef PNG_READ_SUPPORTED +#if PNG_ARM_NEON_OPT > 0 + +#ifdef __ELF__ +# define ELF +#else +# define ELF @ +#endif + + .arch armv7-a + .fpu neon + +.macro func name, export=0 + .macro endfunc +ELF .size \name, . - \name + .endfunc + .purgem endfunc + .endm + .text + .if \export + .global \name + .endif +ELF .type \name, STT_FUNC + .func \name +\name: +.endm + +func png_read_filter_row_sub4_neon, export=1 + ldr r3, [r0, #4] @ rowbytes + vmov.i8 d3, #0 +1: + vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] + vadd.u8 d0, d3, d4 + vadd.u8 d1, d0, d5 + vadd.u8 d2, d1, d6 + vadd.u8 d3, d2, d7 + vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! + subs r3, r3, #16 + bgt 1b + + bx lr +endfunc + +func png_read_filter_row_sub3_neon, export=1 + ldr r3, [r0, #4] @ rowbytes + vmov.i8 d3, #0 + mov r0, r1 + mov r2, #3 + mov r12, #12 + vld1.8 {q11}, [r0], r12 +1: + vext.8 d5, d22, d23, #3 + vadd.u8 d0, d3, d22 + vext.8 d6, d22, d23, #6 + vadd.u8 d1, d0, d5 + vext.8 d7, d23, d23, #1 + vld1.8 {q11}, [r0], r12 + vst1.32 {d0[0]}, [r1,:32], r2 + vadd.u8 d2, d1, d6 + vst1.32 {d1[0]}, [r1], r2 + vadd.u8 d3, d2, d7 + vst1.32 {d2[0]}, [r1], r2 + vst1.32 {d3[0]}, [r1], r2 + subs r3, r3, #12 + bgt 1b + + bx lr +endfunc + +func png_read_filter_row_up_neon, export=1 + ldr r3, [r0, #4] @ rowbytes +1: + vld1.8 {q0}, [r1,:128] + vld1.8 {q1}, [r2,:128]! + vadd.u8 q0, q0, q1 + vst1.8 {q0}, [r1,:128]! + subs r3, r3, #16 + bgt 1b + + bx lr +endfunc + +func png_read_filter_row_avg4_neon, export=1 + ldr r12, [r0, #4] @ rowbytes + vmov.i8 d3, #0 +1: + vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] + vld4.32 {d16[],d17[],d18[],d19[]},[r2,:128]! + vhadd.u8 d0, d3, d16 + vadd.u8 d0, d0, d4 + vhadd.u8 d1, d0, d17 + vadd.u8 d1, d1, d5 + vhadd.u8 d2, d1, d18 + vadd.u8 d2, d2, d6 + vhadd.u8 d3, d2, d19 + vadd.u8 d3, d3, d7 + vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! + subs r12, r12, #16 + bgt 1b + + bx lr +endfunc + +func png_read_filter_row_avg3_neon, export=1 + push {r4,lr} + ldr r12, [r0, #4] @ rowbytes + vmov.i8 d3, #0 + mov r0, r1 + mov r4, #3 + mov lr, #12 + vld1.8 {q11}, [r0], lr +1: + vld1.8 {q10}, [r2], lr + vext.8 d5, d22, d23, #3 + vhadd.u8 d0, d3, d20 + vext.8 d17, d20, d21, #3 + vadd.u8 d0, d0, d22 + vext.8 d6, d22, d23, #6 + vhadd.u8 d1, d0, d17 + vext.8 d18, d20, d21, #6 + vadd.u8 d1, d1, d5 + vext.8 d7, d23, d23, #1 + vld1.8 {q11}, [r0], lr + vst1.32 {d0[0]}, [r1,:32], r4 + vhadd.u8 d2, d1, d18 + vst1.32 {d1[0]}, [r1], r4 + vext.8 d19, d21, d21, #1 + vadd.u8 d2, d2, d6 + vhadd.u8 d3, d2, d19 + vst1.32 {d2[0]}, [r1], r4 + vadd.u8 d3, d3, d7 + vst1.32 {d3[0]}, [r1], r4 + subs r12, r12, #12 + bgt 1b + + pop {r4,pc} +endfunc + +.macro paeth rx, ra, rb, rc + vaddl.u8 q12, \ra, \rb @ a + b + vaddl.u8 q15, \rc, \rc @ 2*c + vabdl.u8 q13, \rb, \rc @ pa + vabdl.u8 q14, \ra, \rc @ pb + vabd.u16 q15, q12, q15 @ pc + vcle.u16 q12, q13, q14 @ pa <= pb + vcle.u16 q13, q13, q15 @ pa <= pc + vcle.u16 q14, q14, q15 @ pb <= pc + vand q12, q12, q13 @ pa <= pb && pa <= pc + vmovn.u16 d28, q14 + vmovn.u16 \rx, q12 + vbsl d28, \rb, \rc + vbsl \rx, \ra, d28 +.endm + +func png_read_filter_row_paeth4_neon, export=1 + ldr r12, [r0, #4] @ rowbytes + vmov.i8 d3, #0 + vmov.i8 d20, #0 +1: + vld4.32 {d4[],d5[],d6[],d7[]}, [r1,:128] + vld4.32 {d16[],d17[],d18[],d19[]},[r2,:128]! + paeth d0, d3, d16, d20 + vadd.u8 d0, d0, d4 + paeth d1, d0, d17, d16 + vadd.u8 d1, d1, d5 + paeth d2, d1, d18, d17 + vadd.u8 d2, d2, d6 + paeth d3, d2, d19, d18 + vmov d20, d19 + vadd.u8 d3, d3, d7 + vst4.32 {d0[0],d1[0],d2[0],d3[0]},[r1,:128]! + subs r12, r12, #16 + bgt 1b + + bx lr +endfunc + +func png_read_filter_row_paeth3_neon, export=1 + push {r4,lr} + ldr r12, [r0, #4] @ rowbytes + vmov.i8 d3, #0 + vmov.i8 d4, #0 + mov r0, r1 + mov r4, #3 + mov lr, #12 + vld1.8 {q11}, [r0], lr +1: + vld1.8 {q10}, [r2], lr + paeth d0, d3, d20, d4 + vext.8 d5, d22, d23, #3 + vadd.u8 d0, d0, d22 + vext.8 d17, d20, d21, #3 + paeth d1, d0, d17, d20 + vst1.32 {d0[0]}, [r1,:32], r4 + vext.8 d6, d22, d23, #6 + vadd.u8 d1, d1, d5 + vext.8 d18, d20, d21, #6 + paeth d2, d1, d18, d17 + vext.8 d7, d23, d23, #1 + vld1.8 {q11}, [r0], lr + vst1.32 {d1[0]}, [r1], r4 + vadd.u8 d2, d2, d6 + vext.8 d19, d21, d21, #1 + paeth d3, d2, d19, d18 + vst1.32 {d2[0]}, [r1], r4 + vmov d4, d19 + vadd.u8 d3, d3, d7 + vst1.32 {d3[0]}, [r1], r4 + subs r12, r12, #12 + bgt 1b + + pop {r4,pc} +endfunc +#endif /* PNG_ARM_NEON_OPT > 0 */ +#endif /* PNG_READ_SUPPORTED */ +#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 (assembler) */ diff --git a/ext/libpng17/arm/filter_neon_intrinsics.c b/ext/libpng17/arm/filter_neon_intrinsics.c new file mode 100644 index 0000000000..09c2516a60 --- /dev/null +++ b/ext/libpng17/arm/filter_neon_intrinsics.c @@ -0,0 +1,376 @@ + +/* filter_neon_intrinsics.c - NEON optimised filter functions + * + * Copyright (c) 2013 Glenn Randers-Pehrson + * Written by James Yu , October 2013. + * Based on filter_neon.S, written by Mans Rullgard, 2011. + * + * Last changed in libpng 1.6.8 [December 19, 2013] + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + */ + +#include "../pngpriv.h" + +/* This code requires -mfpu=neon on the command line: */ +#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ + +#if defined(_MSC_VER) && defined(_M_ARM64) +#include +#else +#include +#endif + +/* libpng row pointers are not necessarily aligned to any particular boundary, + * however this code will only work with appropriate alignment. arm/arm_init.c + * checks for this (and will not compile unless it is done). This code uses + * variants of png_aligncast to avoid compiler warnings. + */ +#define png_ptr(type,pointer) png_aligncast(type *,pointer) +#define png_ptrc(type,pointer) png_aligncastconst(const type *,pointer) + +/* The following relies on a variable 'temp_pointer' being declared with type + * 'type'. This is written this way just to hide the GCC strict aliasing + * warning; note that the code is safe because there never is an alias between + * the input and output pointers. + */ +#define png_ldr(type,pointer)\ + (temp_pointer = png_ptr(type,pointer), *temp_pointer) + +#ifdef PNG_READ_SUPPORTED +#if PNG_ARM_NEON_OPT > 0 + +void +png_read_filter_row_up_neon(png_row_infop row_info, png_bytep row, + png_const_bytep prev_row) +{ + png_bytep rp = row; + png_bytep rp_stop = row + row_info->rowbytes; + png_const_bytep pp = prev_row; + + for (; rp < rp_stop; rp += 16, pp += 16) + { + uint8x16_t qrp, qpp; + + qrp = vld1q_u8(rp); + qpp = vld1q_u8(pp); + qrp = vaddq_u8(qrp, qpp); + vst1q_u8(rp, qrp); + } +} + +void +png_read_filter_row_sub3_neon(png_row_infop row_info, png_bytep row, + png_const_bytep prev_row) +{ + png_bytep rp = row; + png_bytep rp_stop = row + row_info->rowbytes; + + uint8x16_t vtmp = vld1q_u8(rp); + uint8x8x2_t *vrpt = png_ptr(uint8x8x2_t, &vtmp); + uint8x8x2_t vrp = *vrpt; + + uint8x8x4_t vdest; + vdest.val[3] = vdup_n_u8(0); + + for (; rp < rp_stop;) + { + uint8x8_t vtmp1, vtmp2; + uint32x2_t *temp_pointer; + + vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); + vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]); + vtmp2 = vext_u8(vrp.val[0], vrp.val[1], 6); + vdest.val[1] = vadd_u8(vdest.val[0], vtmp1); + + vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); + vdest.val[2] = vadd_u8(vdest.val[1], vtmp2); + vdest.val[3] = vadd_u8(vdest.val[2], vtmp1); + + vtmp = vld1q_u8(rp + 12); + vrpt = png_ptr(uint8x8x2_t, &vtmp); + vrp = *vrpt; + + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); + rp += 3; + } + + PNG_UNUSED(prev_row) +} + +void +png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row, + png_const_bytep prev_row) +{ + png_bytep rp = row; + png_bytep rp_stop = row + row_info->rowbytes; + + uint8x8x4_t vdest; + vdest.val[3] = vdup_n_u8(0); + + for (; rp < rp_stop; rp += 16) + { + uint32x2x4_t vtmp = vld4_u32(png_ptr(uint32_t,rp)); + uint8x8x4_t *vrpt = png_ptr(uint8x8x4_t,&vtmp); + uint8x8x4_t vrp = *vrpt; + uint32x2x4_t *temp_pointer; + + vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]); + vdest.val[1] = vadd_u8(vdest.val[0], vrp.val[1]); + vdest.val[2] = vadd_u8(vdest.val[1], vrp.val[2]); + vdest.val[3] = vadd_u8(vdest.val[2], vrp.val[3]); + vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); + } + + PNG_UNUSED(prev_row) +} + +void +png_read_filter_row_avg3_neon(png_row_infop row_info, png_bytep row, + png_const_bytep prev_row) +{ + png_bytep rp = row; + png_const_bytep pp = prev_row; + png_bytep rp_stop = row + row_info->rowbytes; + + uint8x16_t vtmp; + uint8x8x2_t *vrpt; + uint8x8x2_t vrp; + uint8x8x4_t vdest; + vdest.val[3] = vdup_n_u8(0); + + vtmp = vld1q_u8(rp); + vrpt = png_ptr(uint8x8x2_t,&vtmp); + vrp = *vrpt; + + for (; rp < rp_stop; pp += 12) + { + uint8x8_t vtmp1, vtmp2, vtmp3; + + uint8x8x2_t *vppt; + uint8x8x2_t vpp; + + uint32x2_t *temp_pointer; + + vtmp = vld1q_u8(pp); + vppt = png_ptr(uint8x8x2_t,&vtmp); + vpp = *vppt; + + vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); + vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]); + vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); + + vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3); + vtmp3 = vext_u8(vrp.val[0], vrp.val[1], 6); + vdest.val[1] = vhadd_u8(vdest.val[0], vtmp2); + vdest.val[1] = vadd_u8(vdest.val[1], vtmp1); + + vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 6); + vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); + + vtmp = vld1q_u8(rp + 12); + vrpt = png_ptr(uint8x8x2_t,&vtmp); + vrp = *vrpt; + + vdest.val[2] = vhadd_u8(vdest.val[1], vtmp2); + vdest.val[2] = vadd_u8(vdest.val[2], vtmp3); + + vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1); + + vdest.val[3] = vhadd_u8(vdest.val[2], vtmp2); + vdest.val[3] = vadd_u8(vdest.val[3], vtmp1); + + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); + rp += 3; + } +} + +void +png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row, + png_const_bytep prev_row) +{ + png_bytep rp = row; + png_bytep rp_stop = row + row_info->rowbytes; + png_const_bytep pp = prev_row; + + uint8x8x4_t vdest; + vdest.val[3] = vdup_n_u8(0); + + for (; rp < rp_stop; rp += 16, pp += 16) + { + uint32x2x4_t vtmp; + uint8x8x4_t *vrpt, *vppt; + uint8x8x4_t vrp, vpp; + uint32x2x4_t *temp_pointer; + + vtmp = vld4_u32(png_ptr(uint32_t,rp)); + vrpt = png_ptr(uint8x8x4_t,&vtmp); + vrp = *vrpt; + vtmp = vld4_u32(png_ptrc(uint32_t,pp)); + vppt = png_ptr(uint8x8x4_t,&vtmp); + vpp = *vppt; + + vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]); + vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); + vdest.val[1] = vhadd_u8(vdest.val[0], vpp.val[1]); + vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]); + vdest.val[2] = vhadd_u8(vdest.val[1], vpp.val[2]); + vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]); + vdest.val[3] = vhadd_u8(vdest.val[2], vpp.val[3]); + vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]); + + vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); + } +} + +static uint8x8_t +paeth(uint8x8_t a, uint8x8_t b, uint8x8_t c) +{ + uint8x8_t d, e; + uint16x8_t p1, pa, pb, pc; + + p1 = vaddl_u8(a, b); /* a + b */ + pc = vaddl_u8(c, c); /* c * 2 */ + pa = vabdl_u8(b, c); /* pa */ + pb = vabdl_u8(a, c); /* pb */ + pc = vabdq_u16(p1, pc); /* pc */ + + p1 = vcleq_u16(pa, pb); /* pa <= pb */ + pa = vcleq_u16(pa, pc); /* pa <= pc */ + pb = vcleq_u16(pb, pc); /* pb <= pc */ + + p1 = vandq_u16(p1, pa); /* pa <= pb && pa <= pc */ + + d = vmovn_u16(pb); + e = vmovn_u16(p1); + + d = vbsl_u8(d, b, c); + e = vbsl_u8(e, a, d); + + return e; +} + +void +png_read_filter_row_paeth3_neon(png_row_infop row_info, png_bytep row, + png_const_bytep prev_row) +{ + png_bytep rp = row; + png_const_bytep pp = prev_row; + png_bytep rp_stop = row + row_info->rowbytes; + + uint8x16_t vtmp; + uint8x8x2_t *vrpt; + uint8x8x2_t vrp; + uint8x8_t vlast = vdup_n_u8(0); + uint8x8x4_t vdest; + vdest.val[3] = vdup_n_u8(0); + + vtmp = vld1q_u8(rp); + vrpt = png_ptr(uint8x8x2_t,&vtmp); + vrp = *vrpt; + + for (; rp < rp_stop; pp += 12) + { + uint8x8x2_t *vppt; + uint8x8x2_t vpp; + uint8x8_t vtmp1, vtmp2, vtmp3; + uint32x2_t *temp_pointer; + + vtmp = vld1q_u8(pp); + vppt = png_ptr(uint8x8x2_t,&vtmp); + vpp = *vppt; + + vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast); + vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); + + vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3); + vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3); + vdest.val[1] = paeth(vdest.val[0], vtmp2, vpp.val[0]); + vdest.val[1] = vadd_u8(vdest.val[1], vtmp1); + + vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 6); + vtmp3 = vext_u8(vpp.val[0], vpp.val[1], 6); + vdest.val[2] = paeth(vdest.val[1], vtmp3, vtmp2); + vdest.val[2] = vadd_u8(vdest.val[2], vtmp1); + + vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1); + vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1); + + vtmp = vld1q_u8(rp + 12); + vrpt = png_ptr(uint8x8x2_t,&vtmp); + vrp = *vrpt; + + vdest.val[3] = paeth(vdest.val[2], vtmp2, vtmp3); + vdest.val[3] = vadd_u8(vdest.val[3], vtmp1); + + vlast = vtmp2; + + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0); + rp += 3; + vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0); + rp += 3; + } +} + +void +png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row, + png_const_bytep prev_row) +{ + png_bytep rp = row; + png_bytep rp_stop = row + row_info->rowbytes; + png_const_bytep pp = prev_row; + + uint8x8_t vlast = vdup_n_u8(0); + uint8x8x4_t vdest; + vdest.val[3] = vdup_n_u8(0); + + for (; rp < rp_stop; rp += 16, pp += 16) + { + uint32x2x4_t vtmp; + uint8x8x4_t *vrpt, *vppt; + uint8x8x4_t vrp, vpp; + uint32x2x4_t *temp_pointer; + + vtmp = vld4_u32(png_ptr(uint32_t,rp)); + vrpt = png_ptr(uint8x8x4_t,&vtmp); + vrp = *vrpt; + vtmp = vld4_u32(png_ptrc(uint32_t,pp)); + vppt = png_ptr(uint8x8x4_t,&vtmp); + vpp = *vppt; + + vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast); + vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]); + vdest.val[1] = paeth(vdest.val[0], vpp.val[1], vpp.val[0]); + vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]); + vdest.val[2] = paeth(vdest.val[1], vpp.val[2], vpp.val[1]); + vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]); + vdest.val[3] = paeth(vdest.val[2], vpp.val[3], vpp.val[2]); + vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]); + + vlast = vpp.val[3]; + + vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); + } +} + +#endif /* PNG_ARM_NEON_OPT > 0 */ +#endif /* PNG_READ_SUPPORTED */ +#endif /* PNG_ARM_NEON_IMPLEMENTATION == 1 (intrinsics) */ From af307d05e2c7eb7576dbab46fe0f83964bc9ff54 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 29 Sep 2020 22:42:19 -0700 Subject: [PATCH 3/5] Android: Fix include paths. --- android/jni/Locals.mk | 5 ++--- ext/native/Android.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk index 6e851d5d13..3984fad081 100644 --- a/android/jni/Locals.mk +++ b/android/jni/Locals.mk @@ -14,9 +14,8 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../ext/miniupnp \ $(LOCAL_PATH)/../../ext/miniupnp-build \ $(LOCAL_PATH)/$(NATIVE)/base \ - $(LOCAL_PATH)/$(NATIVE)/ext \ - $(LOCAL_PATH)/$(NATIVE)/ext/libpng17 \ - $(LOCAL_PATH)/$(NATIVE)/ext/libzip \ + $(LOCAL_PATH)/../../ext/libpng17 \ + $(LOCAL_PATH)/../../ext/libzip \ $(LOCAL_PATH)/$(NATIVE) \ $(LOCAL_PATH) diff --git a/ext/native/Android.mk b/ext/native/Android.mk index 9248ca0d5a..a64ee0821e 100644 --- a/ext/native/Android.mk +++ b/ext/native/Android.mk @@ -77,7 +77,7 @@ LOCAL_SRC_FILES :=\ LOCAL_CFLAGS := -O3 -DUSING_GLES2 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -LOCAL_C_INCLUDES := $(LOCAL_PATH)/ext $(LOCAL_PATH)/ext/libpng17 $(LOCAL_PATH)/ext/libzip $(LOCAL_PATH)/ext/glslang .. +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../ext $(LOCAL_PATH)/../../ext/libpng17 $(LOCAL_PATH)/../../ext/libzip $(LOCAL_PATH)/../../ext/glslang .. #Portable native and separate code on android in future is easy you needs add files #by ($(target_arch_ABI),arquitecture (armeabi-v7a , armeabi , x86 , MIPS) From 137f03c71d31074bc2fd7e84a1efc25254c4092f Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 29 Sep 2020 23:04:30 -0700 Subject: [PATCH 4/5] Adnroid: Add back arm32 files for libpng. --- ext/native/Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/native/Android.mk b/ext/native/Android.mk index a64ee0821e..44fe5405b4 100644 --- a/ext/native/Android.mk +++ b/ext/native/Android.mk @@ -86,9 +86,9 @@ ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ math/fast/fast_matrix_neon.S.neon \ - ext/libpng17/arm/arm_init.c \ - ext/libpng17/arm/filter_neon_intrinsics.c \ - ext/libpng17/arm/filter_neon.S.neon + ../../ext/libpng17/arm/arm_init.c \ + ../../ext/libpng17/arm/filter_neon_intrinsics.c \ + ../../ext/libpng17/arm/filter_neon.S.neon else ifeq ($(TARGET_ARCH_ABI),armeabi) LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6 From f8391103a97261fa8826d3574c1abee17670c17d Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 29 Sep 2020 23:25:22 -0700 Subject: [PATCH 5/5] Windows: Correct some stdafx.h paths. --- Windows/Debugger/Debugger_MemoryDlg.cpp | 2 +- Windows/W32Util/PropertySheet.cpp | 4 ++-- Windows/W32Util/ShellUtil.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Windows/Debugger/Debugger_MemoryDlg.cpp b/Windows/Debugger/Debugger_MemoryDlg.cpp index c2bcd0d18f..7e76443bfa 100644 --- a/Windows/Debugger/Debugger_MemoryDlg.cpp +++ b/Windows/Debugger/Debugger_MemoryDlg.cpp @@ -1,6 +1,6 @@ // NOTE: Apologies for the quality of this code, this is really from pre-opensource Dolphin - that is, 2003. -#include "stdafx.h" +#include "Windows/stdafx.h" #include #include "..\resource.h" diff --git a/Windows/W32Util/PropertySheet.cpp b/Windows/W32Util/PropertySheet.cpp index 0ca68dcedd..dc2407dc1d 100644 --- a/Windows/W32Util/PropertySheet.cpp +++ b/Windows/W32Util/PropertySheet.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "Windows/stdafx.h" #include "Misc.h" #include "PropertySheet.h" #include "util/text/utf8.h" @@ -184,4 +184,4 @@ namespace W32Util } return 0; } -} \ No newline at end of file +} diff --git a/Windows/W32Util/ShellUtil.cpp b/Windows/W32Util/ShellUtil.cpp index 39938b3fc0..e53ad9f43f 100644 --- a/Windows/W32Util/ShellUtil.cpp +++ b/Windows/W32Util/ShellUtil.cpp @@ -2,7 +2,7 @@ #pragma warning(disable:4091) // workaround bug in VS2015 headers -#include "stdafx.h" +#include "Windows/stdafx.h" #include #include