mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-01 02:29:59 -06:00
Externals: Convert minizip-ng To Submodule
Due to an oversight in our CMakeLists, pkg-config would attempt to find *minizip* 3.0.0 (which doesn't exist) instead of *minizip-ng* 3.0.0, or at least it was on my Manjaro Linux machine. This has been fixed. The new submodule is using minizip-ng 3.0.4, the same version that was being used before.
This commit is contained in:
68
Externals/minizip-ng/CMakeLists.txt
vendored
Normal file
68
Externals/minizip-ng/CMakeLists.txt
vendored
Normal file
@ -0,0 +1,68 @@
|
||||
project(minizip C)
|
||||
|
||||
add_library(minizip STATIC
|
||||
minizip-ng/mz.h
|
||||
minizip-ng/mz_compat.c
|
||||
minizip-ng/mz_compat.h
|
||||
minizip-ng/mz_crypt.c
|
||||
minizip-ng/mz_crypt.h
|
||||
minizip-ng/mz_os.c
|
||||
minizip-ng/mz_os.h
|
||||
minizip-ng/mz_strm.c
|
||||
minizip-ng/mz_strm.h
|
||||
minizip-ng/mz_strm_buf.c
|
||||
minizip-ng/mz_strm_buf.h
|
||||
minizip-ng/mz_strm_mem.c
|
||||
minizip-ng/mz_strm_mem.h
|
||||
minizip-ng/mz_strm_os.h
|
||||
minizip-ng/mz_strm_split.c
|
||||
minizip-ng/mz_strm_split.h
|
||||
minizip-ng/mz_strm_zlib.c
|
||||
minizip-ng/mz_strm_zlib.h
|
||||
minizip-ng/mz_zip.c
|
||||
minizip-ng/mz_zip.h
|
||||
minizip-ng/mz_zip_rw.c
|
||||
minizip-ng/mz_zip_rw.h
|
||||
)
|
||||
dolphin_disable_warnings(minizip)
|
||||
|
||||
if (UNIX)
|
||||
target_sources(minizip PRIVATE
|
||||
minizip-ng/mz_os_posix.c
|
||||
minizip-ng/mz_strm_os_posix.c
|
||||
)
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
target_sources(minizip PRIVATE
|
||||
minizip-ng/mz_os_win32.c
|
||||
minizip-ng/mz_strm_os_win32.c
|
||||
)
|
||||
endif()
|
||||
|
||||
target_include_directories(minizip PUBLIC minizip-ng)
|
||||
|
||||
target_compile_definitions(minizip PRIVATE HAVE_ZLIB ZLIB_COMPAT MZ_ZIP_NO_CRYPTO MZ_ZIP_NO_ENCRYPTION)
|
||||
if (UNIX)
|
||||
target_compile_definitions(minizip PRIVATE _POSIX_C_SOURCE=200112L)
|
||||
target_compile_definitions(minizip PRIVATE __USE_LARGEFILE64 _LARGEFILE64_SOURCE)
|
||||
endif()
|
||||
|
||||
check_include_file(stdint.h HAVE_STDINT_H)
|
||||
if (HAVE_STDINT_H)
|
||||
target_compile_definitions(minizip PRIVATE HAVE_STDINT_H)
|
||||
endif()
|
||||
|
||||
check_include_file(inttypes.h HAVE_INTTYPES_H)
|
||||
if (HAVE_INTTYPES_H)
|
||||
target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H)
|
||||
endif()
|
||||
|
||||
check_function_exists(fseeko HAVE_FSEEKO)
|
||||
if (NOT HAVE_FSEEKO)
|
||||
target_compile_definitions(minizip PRIVATE NO_FSEEKO)
|
||||
endif()
|
||||
|
||||
target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
|
||||
|
||||
add_library(minizip::minizip ALIAS minizip)
|
13
Externals/minizip-ng/exports.props
vendored
Normal file
13
Externals/minizip-ng/exports.props
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(ExternalsDir)minizip-ng\minizip-ng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(ExternalsDir)minizip-ng\minizip-ng.vcxproj">
|
||||
<Project>{23114507-079a-4418-9707-cfa81a03ca99}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
1
Externals/minizip-ng/minizip-ng
vendored
Submodule
1
Externals/minizip-ng/minizip-ng
vendored
Submodule
Submodule Externals/minizip-ng/minizip-ng added at 3eed562ef0
55
Externals/minizip-ng/minizip-ng.vcxproj
vendored
Normal file
55
Externals/minizip-ng/minizip-ng.vcxproj
vendored
Normal file
@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<Import Project="..\..\Source\VSProps\Base.Macros.props" />
|
||||
<Import Project="$(VSPropsDir)Base.Targets.props" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{23114507-079A-4418-9707-CFA81A03CA99}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VSPropsDir)Base.props" />
|
||||
<Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>HAVE_ZLIB;ZLIB_COMPAT;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="minizip-ng\mz_compat.c" />
|
||||
<ClCompile Include="minizip-ng\mz_crypt.c" />
|
||||
<ClCompile Include="minizip-ng\mz_os.c" />
|
||||
<ClCompile Include="minizip-ng\mz_os_win32.c" />
|
||||
<ClCompile Include="minizip-ng\mz_strm.c" />
|
||||
<ClCompile Include="minizip-ng\mz_strm_buf.c" />
|
||||
<ClCompile Include="minizip-ng\mz_strm_mem.c" />
|
||||
<ClCompile Include="minizip-ng\mz_strm_os_win32.c" />
|
||||
<ClCompile Include="minizip-ng\mz_strm_split.c" />
|
||||
<ClCompile Include="minizip-ng\mz_strm_zlib.c" />
|
||||
<ClCompile Include="minizip-ng\mz_zip.c" />
|
||||
<ClCompile Include="minizip-ng\mz_zip_rw.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="minizip-ng\mz.h" />
|
||||
<ClInclude Include="minizip-ng\mz_compat.h" />
|
||||
<ClInclude Include="minizip-ng\mz_crypt.h" />
|
||||
<ClInclude Include="minizip-ng\mz_os.h" />
|
||||
<ClInclude Include="minizip-ng\mz_strm.h" />
|
||||
<ClInclude Include="minizip-ng\mz_strm_buf.h" />
|
||||
<ClInclude Include="minizip-ng\mz_strm_mem.h" />
|
||||
<ClInclude Include="minizip-ng\mz_strm_os.h" />
|
||||
<ClInclude Include="minizip-ng\mz_strm_split.h" />
|
||||
<ClInclude Include="minizip-ng\mz_strm_zlib.h" />
|
||||
<ClInclude Include="minizip-ng\mz_zip.h" />
|
||||
<ClInclude Include="minizip-ng\mz_zip_rw.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(ExternalsDir)zlib-ng\exports.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
Reference in New Issue
Block a user