Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This iFeature/libzip1.0 seek tell fix #191

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

This iFeature/libzip1.0 seek tell fix #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ccbd23d
Fixed Windows VS2013 compilation
Aug 22, 2015
c7542a0
Fixed ReadiumSDK to be compiled with current Windows Launcher
Aug 22, 2015
b1bf8ab
Fixed Windows VS2013 'Release' configuration build
Aug 22, 2015
934aa12
Original libzip v1.0 files and changes
Aug 23, 2015
5a922d6
Added missed files
Aug 23, 2015
127baac
Added Seek&Tell emulation by rewinding at ZipFileByteStream layer
Aug 24, 2015
6be5832
fix, for the Seek/Tell layer above libzip
Aug 24, 2015
693e0a4
Added Tell/Seek Support into libzip for uncompressed(stored) files
Aug 25, 2015
50a027f
added the Platform\Windows\epub3.vcxproj and Platform\Windows\epub3.v…
Aug 30, 2015
e103e07
Merge branch 'develop' into feature/libzip1.0_seek_tell_fix
danielweck Sep 4, 2015
c123743
fixes cross-platform compile for zipconf.h
danielweck Sep 4, 2015
937410e
fixed XCode build errors by removing obsolete files, and updating the…
danielweck Sep 4, 2015
3a0aaf6
further XCode compile fixes
danielweck Sep 4, 2015
c9614e9
fixed linker error with zip_supports
danielweck Sep 4, 2015
eef1810
fixed empty function body cross-platform compile
danielweck Sep 4, 2015
a0d55a4
minor: var to quick-check sanitized path in zip lib
danielweck Sep 4, 2015
c73aa64
fast fix libzip, etc, workaround
Sep 4, 2015
035ffd2
Modifications to make the new libzip compile in Xcode
nleme Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
328 changes: 298 additions & 30 deletions Platform/Apple/ePub3.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

401 changes: 315 additions & 86 deletions Platform/Windows/ReadiumSDK/ReadiumSDK.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 75 additions & 6 deletions Platform/Windows/ReadiumSDK/ePub3/ePub3.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
Expand All @@ -39,7 +39,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -72,7 +72,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;BUILDING_EPUB3;_SCL_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;BUILDING_EPUB3;_SCL_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\..\..\include;$(MSBuildProjectDirectory)\..\..\..\..\ePub3;$(MSBuildProjectDirectory)\..\..\..\..\ePub3\utilities;$(MSBuildProjectDirectory)\..\..\..\..\ePub3\ePub;$(MSBuildProjectDirectory)\..\..\..\..\ePub3\ThirdParty;$(MSBuildProjectDirectory)\..\Prebuilt\Include</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand Down Expand Up @@ -226,7 +226,9 @@ cscript MakeHeaders.js</Command>
<ClInclude Include="..\..\..\..\ePub3\ThirdParty\google-url\src\url_util_internal.h" />
<ClInclude Include="..\..\..\..\ePub3\ThirdParty\libzip\Config.h" />
<ClInclude Include="..\..\..\..\ePub3\ThirdParty\libzip\zip.h" />
<ClInclude Include="..\..\..\..\ePub3\ThirdParty\libzip\zipconf.h" />
<ClInclude Include="..\..\..\..\ePub3\ThirdParty\libzip\zipint.h" />
<ClInclude Include="..\..\..\..\ePub3\ThirdParty\libzip\zipwin32.h" />
<ClInclude Include="..\..\..\..\ePub3\ThirdParty\utf8-cpp\include\utf8.h" />
<ClInclude Include="..\..\..\..\ePub3\utilities\alphanum.hpp" />
<ClInclude Include="..\..\..\..\ePub3\utilities\basic.h" />
Expand Down Expand Up @@ -261,16 +263,29 @@ cscript MakeHeaders.js</Command>
<ClCompile Include="..\..\..\..\ePub3\ePub\cfi.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\container.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\content_handler.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\content_module_manager.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\credential_request.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\encryption.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\epub_collection.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\filter_chain.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\filter_chain_byte_stream.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\filter_chain_byte_stream_range.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\filter_manager.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\filter_manager_impl.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\font_obfuscation.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\glossary.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\initialization.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\library.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\link.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\manifest.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\media-overlays_smil_data.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\media-overlays_smil_model.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\media_support_info.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\nav_point.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\nav_table.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\object_preprocessor.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\package.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\PassThroughFilter.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\property.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\property_extension.cpp" />
<ClCompile Include="..\..\..\..\ePub3\ePub\property_holder.cpp" />
Expand Down Expand Up @@ -301,33 +316,52 @@ cscript MakeHeaders.js</Command>
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\mkstemp.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_add.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_add_dir.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_add_entry.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_buffer.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_close.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_delete.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_dirent.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_entry_free.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_entry_new.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_dir_add.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_discard.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_entry.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_error.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_error_clear.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_error_get.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_error_get_sys_type.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_error_strerror.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_error_to_str.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_err_str.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_extra_field.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_extra_field_api.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_fclose.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_fdopen.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_filerange_crc.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_add.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_error_clear.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_error_get.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_get_comment.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_get_external_attributes.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_get_offset.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_rename.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_replace.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_set_comment.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_set_external_attributes.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_set_mtime.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_file_strerror.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_fopen.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_fopen_encrypted.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_fopen_index.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_fopen_index_encrypted.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_fread.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_free.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_archive_comment.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_archive_flag.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_compression_implementation.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_encryption_implementation.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_file_comment.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_name.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_num_entries.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_get_num_files.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_io_util.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_memdup.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_name_locate.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_new.c" />
Expand All @@ -336,25 +370,60 @@ cscript MakeHeaders.js</Command>
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_replace.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_set_archive_comment.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_set_archive_flag.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_set_default_password.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_set_file_comment.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_set_file_compression.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_set_name.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_begin_write.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_buffer.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_call.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_close.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_commit_write.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_crc.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_deflate.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_error.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_file.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_filep.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_free.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_function.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_is_deleted.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_layered.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_open.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_pkware.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_read.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_remove.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_rollback_write.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_seek.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_seek_write.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_stat.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_supports.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_tell.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_tell_write.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_win32handle.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_window.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_write.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_zip.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_source_zip_new.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_stat.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_stat_index.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_stat_init.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_strerror.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_string.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_unchange.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_unchange_all.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_unchange_archive.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_unchange_data.c" />
<ClCompile Include="..\..\..\..\ePub3\ThirdParty\libzip\zip_utf-8.c" />
<ClCompile Include="..\..\..\..\ePub3\utilities\byte_buffer.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\byte_stream.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\CPUCacheUtils_win.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\epub_locale.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\error_handler.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\executor.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\future.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\iri.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\optional.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\path_help.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\ref_counted.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\ring_buffer.cpp" />
<ClCompile Include="..\..\..\..\ePub3\utilities\run_loop_windows.cpp" />
Expand Down
Loading