summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt5
-rw-r--r--externals/CMakeLists.txt7
-rw-r--r--externals/find-modules/Findlibzip.cmake72
-rw-r--r--externals/libzip/CMakeLists.txt564
m---------externals/libzip/libzip0
-rw-r--r--src/core/CMakeLists.txt2
7 files changed, 1 insertions, 652 deletions
diff --git a/.gitmodules b/.gitmodules
index 749cd0408..dc6ed500f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,6 @@
28[submodule "mbedtls"] 28[submodule "mbedtls"]
29 path = externals/mbedtls 29 path = externals/mbedtls
30 url = https://github.com/yuzu-emu/mbedtls 30 url = https://github.com/yuzu-emu/mbedtls
31[submodule "libzip"]
32 path = externals/libzip/libzip
33 url = https://github.com/nih-at/libzip.git
34[submodule "xbyak"] 31[submodule "xbyak"]
35 path = externals/xbyak 32 path = externals/xbyak
36 url = https://github.com/herumi/xbyak.git 33 url = https://github.com/herumi/xbyak.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7ea86d8a..5c3142a6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -422,11 +422,6 @@ if (CONAN_REQUIRED_LIBS)
422 endif() 422 endif()
423 include(${CMAKE_BINARY_DIR}/conan.cmake) 423 include(${CMAKE_BINARY_DIR}/conan.cmake)
424 424
425 set(CONAN_LIB_OPTIONS
426 libzip:with_openssl=False
427 libzip:enable_windows_crypto=False
428 )
429
430 conan_check(VERSION 1.24.0 REQUIRED) 425 conan_check(VERSION 1.24.0 REQUIRED)
431 426
432 # Manually add iconv to fix a dep conflict between qt and sdl2 427 # Manually add iconv to fix a dep conflict between qt and sdl2
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 0c2c059a9..a76a3d800 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -93,13 +93,6 @@ endif()
93# Sirit 93# Sirit
94add_subdirectory(sirit) 94add_subdirectory(sirit)
95 95
96# libzip
97find_package(libzip 1.5)
98if (NOT libzip_FOUND)
99 message(STATUS "libzip 1.5 or newer not found, falling back to externals")
100 add_subdirectory(libzip EXCLUDE_FROM_ALL)
101endif()
102
103if (ENABLE_WEB_SERVICE) 96if (ENABLE_WEB_SERVICE)
104 find_package(OpenSSL 1.1) 97 find_package(OpenSSL 1.1)
105 if (OPENSSL_FOUND) 98 if (OPENSSL_FOUND)
diff --git a/externals/find-modules/Findlibzip.cmake b/externals/find-modules/Findlibzip.cmake
deleted file mode 100644
index 8934de3b8..000000000
--- a/externals/find-modules/Findlibzip.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
1
2find_package(PkgConfig QUIET)
3pkg_check_modules(PC_libzip QUIET libzip)
4
5find_path(libzip_INCLUDE_DIR
6 NAMES zip.h
7 PATHS ${PC_libzip_INCLUDE_DIRS}
8 "$ENV{LIB_DIR}/include"
9 "$ENV{INCLUDE}"
10 /usr/local/include
11 /usr/include
12)
13find_path(libzip_INCLUDE_DIR_ZIPCONF
14 NAMES zipconf.h
15 HINTS ${PC_libzip_INCLUDE_DIRS}
16 "$ENV{LIB_DIR}/include"
17 "$ENV{LIB_DIR}/lib/libzip/include"
18 "$ENV{LIB}/lib/libzip/include"
19 /usr/local/lib/libzip/include
20 /usr/lib/libzip/include
21 /usr/local/include
22 /usr/include
23 "$ENV{INCLUDE}"
24)
25find_library(libzip_LIBRARY
26 NAMES zip
27 PATHS ${PC_libzip_LIBRARY_DIRS}
28 "$ENV{LIB_DIR}/lib" "$ENV{LIB}" /usr/local/lib /usr/lib
29)
30
31if (libzip_INCLUDE_DIR_ZIPCONF)
32 FILE(READ "${libzip_INCLUDE_DIR_ZIPCONF}/zipconf.h" _libzip_VERSION_CONTENTS)
33 if (_libzip_VERSION_CONTENTS)
34 STRING(REGEX REPLACE ".*#define LIBZIP_VERSION \"([0-9.]+)\".*" "\\1" libzip_VERSION "${_libzip_VERSION_CONTENTS}")
35 endif()
36 unset(_libzip_VERSION_CONTENTS)
37endif()
38
39set(libzip_VERSION ${libzip_VERSION} CACHE STRING "Version number of libzip")
40
41include(FindPackageHandleStandardArgs)
42find_package_handle_standard_args(libzip
43 FOUND_VAR libzip_FOUND
44 REQUIRED_VARS
45 libzip_LIBRARY
46 libzip_INCLUDE_DIR
47 libzip_INCLUDE_DIR_ZIPCONF
48 libzip_VERSION
49 VERSION_VAR libzip_VERSION
50)
51
52if(libzip_FOUND)
53 set(libzip_LIBRARIES ${libzip_LIBRARY})
54 set(libzip_INCLUDE_DIRS ${libzip_INCLUDE_DIR})
55 set(libzip_DEFINITIONS ${PC_libzip_CFLAGS_OTHER})
56endif()
57
58if(libzip_FOUND AND NOT TARGET libzip::libzip)
59 add_library(libzip::libzip UNKNOWN IMPORTED)
60 set_target_properties(libzip::libzip PROPERTIES
61 IMPORTED_LOCATION "${libzip_LIBRARY}"
62 INTERFACE_COMPILE_OPTIONS "${PC_libzip_CFLAGS_OTHER}"
63 INTERFACE_INCLUDE_DIRECTORIES "${libzip_INCLUDE_DIR}"
64 )
65endif()
66
67mark_as_advanced(
68 libzip_INCLUDE_DIR
69 libzip_INCLUDE_DIR_ZIPCONF
70 libzip_LIBRARY
71 libzip_VERSION
72)
diff --git a/externals/libzip/CMakeLists.txt b/externals/libzip/CMakeLists.txt
deleted file mode 100644
index ea5329fa0..000000000
--- a/externals/libzip/CMakeLists.txt
+++ /dev/null
@@ -1,564 +0,0 @@
1# TODO:
2# create usable libtool .la file
3
4CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
5
6LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libzip")
7
8PROJECT(libzip C)
9
10OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
11OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
12OPTION(ENABLE_MBEDTLS "Enable use of mbed TLS" ON)
13OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
14OPTION(ENABLE_WINDOWS_CRYPTO "Enable use of Windows cryptography libraries" ON)
15
16OPTION(ENABLE_BZIP2 "Enable use of BZip2" OFF)
17OPTION(ENABLE_LZMA "Enable use of LZMA" OFF)
18
19INCLUDE(CheckFunctionExists)
20INCLUDE(CheckIncludeFiles)
21INCLUDE(CheckSymbolExists)
22INCLUDE(CheckTypeSize)
23INCLUDE(CheckCSourceRuns)
24INCLUDE(CheckCSourceCompiles)
25INCLUDE(CheckStructHasMember)
26INCLUDE(TestBigEndian)
27INCLUDE(GNUInstallDirs)
28IF(ENABLE_COMMONCRYPTO)
29 CHECK_INCLUDE_FILES(CommonCrypto/CommonCrypto.h COMMONCRYPTO_FOUND)
30ELSE()
31 SET(COMMONCRYPTO_FOUND FALSE)
32ENDIF()
33IF(ENABLE_GNUTLS)
34 INCLUDE(FindNettle)
35 INCLUDE(FindGnuTLS)
36ELSE()
37 SET(GNUTLS_FOUND FALSE)
38ENDIF()
39IF(ENABLE_MBEDTLS)
40 FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h)
41 FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto)
42ELSE()
43 SET(MBEDTLS_LIBRARIES FALSE)
44ENDIF()
45IF(ENABLE_OPENSSL)
46 INCLUDE(FindOpenSSL)
47ELSE()
48 SET(OPENSSL_FOUND FALSE)
49ENDIF()
50IF(WIN32)
51 IF(ENABLE_WINDOWS_CRYPTO)
52 SET(WINDOWS_CRYPTO_FOUND TRUE)
53 ENDIF()
54ELSE()
55 SET(WINDOWS_CRYPTO_FOUND FALSE)
56ENDIF()
57
58OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
59OPTION(SHARED_LIB_VERSIONNING "Add SO version in .so build" ON)
60
61SET(PACKAGE "libzip")
62SET(PACKAGE_NAME ${PACKAGE})
63SET(PACKAGE_VERSION_MAJOR "1")
64SET(PACKAGE_VERSION_MINOR "5")
65SET(PACKAGE_VERSION_MICRO "2a")
66#SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
67SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_MICRO}")
68SET(PACKAGE_VERSION ${VERSION})
69SET(LIBZIP_VERSION ${PACKAGE_VERSION})
70SET(LIBZIP_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
71SET(LIBZIP_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
72SET(LIBZIP_VERSION_MICRO ${PACKAGE_VERSION_MICRO})
73SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
74
75SET(ARCHIVE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
76IF(NOT TARGET dist)
77ADD_CUSTOM_TARGET(dist
78 COMMAND git config tar.tar.xz.command "xz -c"
79 COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.gz HEAD
80 COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.xz HEAD
81 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
82 )
83ADD_CUSTOM_TARGET(distcheck
84 COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest 2>/dev/null || true
85 COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest
86 COMMAND cmake -E tar xf ${ARCHIVE_NAME}.tar.gz
87 COMMAND chmod -R u-w ${ARCHIVE_NAME}
88 COMMAND mkdir ${ARCHIVE_NAME}-build
89 COMMAND mkdir ${ARCHIVE_NAME}-dest
90 COMMAND cd ${ARCHIVE_NAME}-build && cmake -DCMAKE_INSTALL_PREFIX=../${ARCHIVE_NAME}-dest ../${ARCHIVE_NAME}
91 COMMAND cd ${ARCHIVE_NAME}-build && make -j4
92 COMMAND cd ${ARCHIVE_NAME}-build && make test
93 COMMAND cd ${ARCHIVE_NAME}-build && make install
94# COMMAND cd ${ARCHIVE_NAME}-build && make uninstall
95# COMMAND if [ `find ${ARCHIVE_NAME}-dest ! -type d | wc -l` -ne 0 ]; then echo leftover files in ${ARCHIVE_NAME}-dest; false; fi
96 COMMAND cd ${ARCHIVE_NAME}-build && make clean
97 COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest
98 COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest
99 COMMAND echo "${ARCHIVE_NAME}.tar.gz is ready for distribution."
100 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
101 )
102ADD_DEPENDENCIES(distcheck dist)
103ENDIF(NOT TARGET dist)
104
105IF(BUILD_SHARED_LIBS)
106 SET(HAVE_SHARED TRUE)
107ELSE()
108 SET(ZIP_STATIC TRUE)
109ENDIF()
110
111# Checks
112
113CHECK_FUNCTION_EXISTS(_chmod HAVE__CHMOD)
114CHECK_FUNCTION_EXISTS(_close HAVE__CLOSE)
115CHECK_FUNCTION_EXISTS(_dup HAVE__DUP)
116CHECK_FUNCTION_EXISTS(_fdopen HAVE__FDOPEN)
117CHECK_FUNCTION_EXISTS(_fileno HAVE__FILENO)
118CHECK_FUNCTION_EXISTS(_open HAVE__OPEN)
119CHECK_FUNCTION_EXISTS(_setmode HAVE__SETMODE)
120CHECK_FUNCTION_EXISTS(_snprintf HAVE__SNPRINTF)
121CHECK_FUNCTION_EXISTS(_strdup HAVE__STRDUP)
122CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP)
123CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64)
124CHECK_FUNCTION_EXISTS(_strtoui64 HAVE__STRTOUI64)
125CHECK_FUNCTION_EXISTS(_unlink HAVE__UNLINK)
126CHECK_FUNCTION_EXISTS(arc4random HAVE_ARC4RANDOM)
127CHECK_FUNCTION_EXISTS(clonefile HAVE_CLONEFILE)
128CHECK_FUNCTION_EXISTS(explicit_bzero HAVE_EXPLICIT_BZERO)
129CHECK_FUNCTION_EXISTS(explicit_memset HAVE_EXPLICIT_MEMSET)
130CHECK_FUNCTION_EXISTS(fileno HAVE_FILENO)
131CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
132CHECK_FUNCTION_EXISTS(ftello HAVE_FTELLO)
133CHECK_FUNCTION_EXISTS(getprogname HAVE_GETPROGNAME)
134CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R)
135CHECK_FUNCTION_EXISTS(open HAVE_OPEN)
136CHECK_FUNCTION_EXISTS(setmode HAVE_SETMODE)
137CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF)
138CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
139CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP)
140CHECK_FUNCTION_EXISTS(stricmp HAVE_STRICMP)
141CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL)
142CHECK_FUNCTION_EXISTS(strtoull HAVE_STRTOULL)
143
144CHECK_INCLUDE_FILES("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
145CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H)
146CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
147CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
148
149CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H_LIBZIP)
150CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H_LIBZIP)
151CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H_LIBZIP)
152
153# TODO: fix test
154# this test does not find __progname even when it exists
155#CHECK_SYMBOL_EXISTS(__progname stdlib.h HAVE___PROGNAME)
156
157CHECK_TYPE_SIZE(__int8 __INT8_LIBZIP)
158CHECK_TYPE_SIZE(int8_t INT8_T_LIBZIP)
159CHECK_TYPE_SIZE(uint8_t UINT8_T_LIBZIP)
160CHECK_TYPE_SIZE(__int16 __INT16_LIBZIP)
161CHECK_TYPE_SIZE(int16_t INT16_T_LIBZIP)
162CHECK_TYPE_SIZE(uint16_t UINT16_T_LIBZIP)
163CHECK_TYPE_SIZE(__int32 __INT32_LIBZIP)
164CHECK_TYPE_SIZE(int32_t INT32_T_LIBZIP)
165CHECK_TYPE_SIZE(uint32_t UINT32_T_LIBZIP)
166CHECK_TYPE_SIZE(__int64 __INT64_LIBZIP)
167CHECK_TYPE_SIZE(int64_t INT64_T_LIBZIP)
168CHECK_TYPE_SIZE(uint64_t UINT64_T_LIBZIP)
169CHECK_TYPE_SIZE("short" SHORT_LIBZIP)
170CHECK_TYPE_SIZE("int" INT_LIBZIP)
171CHECK_TYPE_SIZE("long" LONG_LIBZIP)
172CHECK_TYPE_SIZE("long long" LONG_LONG_LIBZIP)
173CHECK_TYPE_SIZE("off_t" SIZEOF_OFF_T)
174CHECK_TYPE_SIZE("size_t" SIZE_T_LIBZIP)
175CHECK_TYPE_SIZE("ssize_t" SSIZE_T_LIBZIP)
176
177CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
178#include <linux/fs.h>
179int main(int argc, char *argv[]) { unsigned long x = FICLONERANGE; }" HAVE_FICLONERANGE)
180
181CHECK_C_SOURCE_COMPILES("
182int foo(char * _Nullable bar);
183int main(int argc, char *argv[]) { }" HAVE_NULLABLE)
184
185TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
186
187#FIND_PACKAGE(ZLIB 1.1.2 REQUIRED)
188INCLUDE_DIRECTORIES(../zlib/zlib)
189SET(CMAKE_REQUIRED_INCLUDES ../zlib/zlib)
190
191IF(ENABLE_BZIP2)
192 FIND_PACKAGE(BZip2)
193 IF(BZIP2_FOUND)
194 SET (HAVE_LIBBZ2 1)
195
196 INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
197 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${BZIP2_LIBRARIES})
198 ELSE()
199 MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
200 ENDIF(BZIP2_FOUND)
201ENDIF(ENABLE_BZIP2)
202
203IF(ENABLE_LZMA)
204 FIND_PACKAGE(LibLZMA)
205 IF(LIBLZMA_FOUND)
206 SET (HAVE_LIBLZMA 1)
207
208 INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIR})
209 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${LIBLZMA_LIBRARY})
210 ELSE()
211 MESSAGE(WARNING "-- lzma library not found; lzma support disabled")
212 ENDIF(LIBLZMA_FOUND)
213ENDIF(ENABLE_LZMA)
214
215
216IF (COMMONCRYPTO_FOUND)
217 SET (HAVE_CRYPTO 1)
218 SET (HAVE_COMMONCRYPTO 1)
219ELSEIF (WINDOWS_CRYPTO_FOUND)
220 SET (HAVE_CRYPTO 1)
221 SET (HAVE_WINDOWS_CRYPTO 1)
222ELSEIF (GNUTLS_FOUND AND NETTLE_FOUND)
223 SET (HAVE_CRYPTO 1)
224 SET (HAVE_GNUTLS 1)
225 INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR} ${NETTLE_INCLUDE_DIR})
226 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${GNUTLS_LIBRARY} ${NETTLE_LIBRARY})
227ELSEIF (OPENSSL_FOUND)
228 SET (HAVE_CRYPTO 1)
229 SET (HAVE_OPENSSL 1)
230 INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
231 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${OPENSSL_LIBRARIES})
232ELSEIF (MBEDTLS_LIBRARIES)
233 SET (HAVE_CRYPTO 1)
234 SET (HAVE_MBEDTLS 1)
235 INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIR})
236 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${MBEDTLS_LIBRARIES})
237ENDIF()
238
239IF (NOT HAVE_CRYPTO)
240 MESSAGE(WARNING "-- neither Common Crypto, GnuTLS, mbed TLS, OpenSSL, nor Windows Cryptography found; AES support disabled")
241ENDIF()
242
243IF(MSVC)
244ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
245ADD_DEFINITIONS("-D_CRT_NONSTDC_NO_DEPRECATE")
246ENDIF(MSVC)
247
248if(WIN32)
249 if(HAVE_WINDOWS_CRYPTO)
250 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} bcrypt)
251 endif()
252 if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
253 ADD_DEFINITIONS(-DMS_UWP)
254 else(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
255 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} advapi32)
256 endif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
257endif(WIN32)
258
259ADD_DEFINITIONS("-DHAVE_CONFIG_H")
260
261# rpath handling: use rpath in installed binaries
262IF(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
263 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
264 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
265ENDIF()
266
267# fixed size integral types
268
269IF(HAVE_INTTYPES_H_LIBZIP)
270 SET(LIBZIP_TYPES_INCLUDE "#define __STDC_FORMAT_MACROS 1
271#include <inttypes.h>")
272ELSEIF(HAVE_STDINT_H_LIBZIP)
273 SET(LIBZIP_TYPES_INCLUDE "#include <stdint.h>")
274ELSEIF(HAVE_SYS_TYPES_H_LIBZIP)
275 SET(LIBZIP_TYPES_INCLUDE "#include <sys/types.h>")
276ENDIF()
277
278IF(HAVE_INT8_T_LIBZIP)
279 SET(ZIP_INT8_T int8_t)
280ELSEIF(HAVE___INT8_LIBZIP)
281 SET(ZIP_INT8_T __int8)
282ELSE()
283 SET(ZIP_INT8_T "signed char")
284ENDIF()
285
286IF(HAVE_UINT8_T_LIBZIP)
287 SET(ZIP_UINT8_T uint8_t)
288ELSEIF(HAVE___INT8_LIBZIP)
289 SET(ZIP_UINT8_T "unsigned __int8")
290ELSE()
291 SET(ZIP_UINT8_T "unsigned char")
292ENDIF()
293
294IF(HAVE_INT16_T_LIBZIP)
295 SET(ZIP_INT16_T int16_t)
296ELSEIF(HAVE___INT16_LIBZIP)
297 SET(INT16_T_LIBZIP __int16)
298ELSEIF(SHORT_LIBZIP EQUAL 2)
299 SET(INT16_T_LIBZIP short)
300ENDIF()
301
302IF(HAVE_UINT16_T_LIBZIP)
303 SET(ZIP_UINT16_T uint16_t)
304ELSEIF(HAVE___INT16_LIBZIP)
305 SET(UINT16_T_LIBZIP "unsigned __int16")
306ELSEIF(SHORT_LIBZIP EQUAL 2)
307 SET(UINT16_T_LIBZIP "unsigned short")
308ENDIF()
309
310IF(HAVE_INT32_T_LIBZIP)
311 SET(ZIP_INT32_T int32_t)
312ELSEIF(HAVE___INT32_LIBZIP)
313 SET(ZIP_INT32_T __int32)
314ELSEIF(INT_LIBZIP EQUAL 4)
315 SET(ZIP_INT32_T int)
316ELSEIF(LONG_LIBZIP EQUAL 4)
317 SET(ZIP_INT32_T long)
318ENDIF()
319
320IF(HAVE_UINT32_T_LIBZIP)
321SET(ZIP_UINT32_T uint32_t)
322ELSEIF(HAVE___INT32_LIBZIP)
323SET(ZIP_UINT32_T "unsigned __int32")
324ELSEIF(INT_LIBZIP EQUAL 4)
325SET(ZIP_UINT32_T "unsigned int")
326ELSEIF(LONG_LIBZIP EQUAL 4)
327SET(ZIP_UINT32_T "unsigned long")
328ENDIF()
329
330IF(HAVE_INT64_T_LIBZIP)
331 SET(ZIP_INT64_T int64_t)
332ELSEIF(HAVE___INT64_LIBZIP)
333 SET(ZIP_INT64_T __int64)
334ELSEIF(LONG_LIBZIP EQUAL 8)
335 SET(ZIP_INT64_T long)
336ELSEIF(LONG_LONG_LIBZIP EQUAL 8)
337 SET(ZIP_INT64_T "long long")
338ENDIF()
339
340IF(HAVE_UINT64_T_LIBZIP)
341 SET(ZIP_UINT64_T uint64_t)
342ELSEIF(HAVE___INT64_LIBZIP)
343 SET(ZIP_UINT64_T "unsigned __int64")
344ELSEIF(LONG_LIBZIP EQUAL 8)
345 SET(ZIP_UINT64_T "unsigned long")
346ELSEIF(LONG_LONG_LIBZIP EQUAL 8)
347 SET(ZIP_UINT64_T "unsigned long long")
348ENDIF()
349
350IF(HAVE_NULLABLE)
351 SET(ZIP_NULLABLE_DEFINES)
352ELSE()
353 SET(ZIP_NULLABLE_DEFINES "#define _Nullable
354#define _Nonnull")
355ENDIF()
356
357# write out config file
358CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libzip/cmake-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/libzip/config.h)
359CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libzip/cmake-zipconf.h.in ${CMAKE_CURRENT_BINARY_DIR}/libzip/zipconf.h)
360
361# installation
362INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
363INSTALL(FILES libzip/lib/zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
364
365SET(CMAKE_C_VISIBILITY_PRESET hidden)
366
367ADD_LIBRARY(zip
368 libzip/lib/zip_add.c
369 libzip/lib/zip_add_dir.c
370 libzip/lib/zip_add_entry.c
371 libzip/lib/zip_algorithm_deflate.c
372 libzip/lib/zip_buffer.c
373 libzip/lib/zip_close.c
374 libzip/lib/zip_delete.c
375 libzip/lib/zip_dir_add.c
376 libzip/lib/zip_dirent.c
377 libzip/lib/zip_discard.c
378 libzip/lib/zip_entry.c
379 libzip/lib/zip_err_str.c
380 libzip/lib/zip_error.c
381 libzip/lib/zip_error_clear.c
382 libzip/lib/zip_error_get.c
383 libzip/lib/zip_error_get_sys_type.c
384 libzip/lib/zip_error_strerror.c
385 libzip/lib/zip_error_to_str.c
386 libzip/lib/zip_extra_field.c
387 libzip/lib/zip_extra_field_api.c
388 libzip/lib/zip_fclose.c
389 libzip/lib/zip_fdopen.c
390 libzip/lib/zip_file_add.c
391 libzip/lib/zip_file_error_clear.c
392 libzip/lib/zip_file_error_get.c
393 libzip/lib/zip_file_get_comment.c
394 libzip/lib/zip_file_get_external_attributes.c
395 libzip/lib/zip_file_get_offset.c
396 libzip/lib/zip_file_rename.c
397 libzip/lib/zip_file_replace.c
398 libzip/lib/zip_file_set_comment.c
399 libzip/lib/zip_file_set_encryption.c
400 libzip/lib/zip_file_set_external_attributes.c
401 libzip/lib/zip_file_set_mtime.c
402 libzip/lib/zip_file_strerror.c
403 libzip/lib/zip_filerange_crc.c
404 libzip/lib/zip_fopen.c
405 libzip/lib/zip_fopen_encrypted.c
406 libzip/lib/zip_fopen_index.c
407 libzip/lib/zip_fopen_index_encrypted.c
408 libzip/lib/zip_fread.c
409 libzip/lib/zip_fseek.c
410 libzip/lib/zip_ftell.c
411 libzip/lib/zip_get_archive_comment.c
412 libzip/lib/zip_get_archive_flag.c
413 libzip/lib/zip_get_encryption_implementation.c
414 libzip/lib/zip_get_file_comment.c
415 libzip/lib/zip_get_name.c
416 libzip/lib/zip_get_num_entries.c
417 libzip/lib/zip_get_num_files.c
418 libzip/lib/zip_hash.c
419 libzip/lib/zip_io_util.c
420 libzip/lib/zip_libzip_version.c
421 libzip/lib/zip_memdup.c
422 libzip/lib/zip_name_locate.c
423 libzip/lib/zip_new.c
424 libzip/lib/zip_open.c
425 libzip/lib/zip_progress.c
426 libzip/lib/zip_rename.c
427 libzip/lib/zip_replace.c
428 libzip/lib/zip_set_archive_comment.c
429 libzip/lib/zip_set_archive_flag.c
430 libzip/lib/zip_set_default_password.c
431 libzip/lib/zip_set_file_comment.c
432 libzip/lib/zip_set_file_compression.c
433 libzip/lib/zip_set_name.c
434 libzip/lib/zip_source_accept_empty.c
435 libzip/lib/zip_source_begin_write.c
436 libzip/lib/zip_source_begin_write_cloning.c
437 libzip/lib/zip_source_buffer.c
438 libzip/lib/zip_source_call.c
439 libzip/lib/zip_source_close.c
440 libzip/lib/zip_source_commit_write.c
441 libzip/lib/zip_source_compress.c
442 libzip/lib/zip_source_crc.c
443 libzip/lib/zip_source_error.c
444 libzip/lib/zip_source_filep.c
445 libzip/lib/zip_source_free.c
446 libzip/lib/zip_source_function.c
447 libzip/lib/zip_source_get_compression_flags.c
448 libzip/lib/zip_source_is_deleted.c
449 libzip/lib/zip_source_layered.c
450 libzip/lib/zip_source_open.c
451 libzip/lib/zip_source_pkware.c
452 libzip/lib/zip_source_read.c
453 libzip/lib/zip_source_remove.c
454 libzip/lib/zip_source_rollback_write.c
455 libzip/lib/zip_source_seek.c
456 libzip/lib/zip_source_seek_write.c
457 libzip/lib/zip_source_stat.c
458 libzip/lib/zip_source_supports.c
459 libzip/lib/zip_source_tell.c
460 libzip/lib/zip_source_tell_write.c
461 libzip/lib/zip_source_window.c
462 libzip/lib/zip_source_write.c
463 libzip/lib/zip_source_zip.c
464 libzip/lib/zip_source_zip_new.c
465 libzip/lib/zip_stat.c
466 libzip/lib/zip_stat_index.c
467 libzip/lib/zip_stat_init.c
468 libzip/lib/zip_strerror.c
469 libzip/lib/zip_string.c
470 libzip/lib/zip_unchange.c
471 libzip/lib/zip_unchange_all.c
472 libzip/lib/zip_unchange_archive.c
473 libzip/lib/zip_unchange_data.c
474 libzip/lib/zip_utf-8.c
475)
476
477IF(WIN32)
478 target_sources(zip PRIVATE
479 libzip/lib/zip_source_win32handle.c
480 libzip/lib/zip_source_win32utf8.c
481 libzip/lib/zip_source_win32w.c
482 )
483 IF(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
484 ELSE()
485 target_sources(zip PRIVATE libzip/lib/zip_source_win32a.c)
486 ENDIF()
487ELSE()
488 target_sources(zip PRIVATE
489 libzip/lib/zip_mkstempm.c
490 libzip/lib/zip_source_file.c
491 libzip/lib/zip_random_unix.c
492 )
493ENDIF()
494
495IF(HAVE_LIBBZ2)
496 target_sources(zip PRIVATE libzip/lib/zip_algorithm_bzip2.c)
497ENDIF()
498
499IF(HAVE_LIBLZMA)
500 target_sources(zip PRIVATE libzip/lib/zip_algorithm_xz.c)
501ENDIF()
502
503IF(HAVE_COMMONCRYPTO)
504 target_sources(zip PRIVATE libzip/lib/zip_crypto_commoncrypto.c)
505ELSEIF(HAVE_WINDOWS_CRYPTO)
506 target_sources(zip PRIVATE libzip/lib/zip_crypto_win.c)
507ELSEIF(HAVE_GNUTLS)
508 target_sources(zip PRIVATE libzip/lib/zip_crypto_gnutls.c)
509ELSEIF(HAVE_OPENSSL)
510 target_sources(zip PRIVATE libzip/lib/zip_crypto_openssl.c)
511ELSEIF(HAVE_MBEDTLS)
512 target_sources(zip PRIVATE libzip/lib/zip_crypto_mbedtls.c)
513ENDIF()
514
515IF(HAVE_CRYPTO)
516 target_sources(zip PRIVATE
517 libzip/lib/zip_winzip_aes.c
518 libzip/lib/zip_source_winzip_aes_decode.c
519 libzip/lib/zip_source_winzip_aes_encode.c
520 )
521ENDIF()
522
523target_include_directories(zip
524PUBLIC
525 libzip/lib
526 ${CMAKE_CURRENT_BINARY_DIR}/libzip
527)
528
529# pkgconfig file
530SET(prefix ${CMAKE_INSTALL_PREFIX})
531SET(exec_prefix \${prefix})
532SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR})
533SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
534SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
535IF(CMAKE_SYSTEM_NAME MATCHES BSD)
536 SET(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
537ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD)
538get_target_property(LIBS_PRIVATE zip LINK_LIBRARIES)
539foreach(LIB ${LIBS_PRIVATE})
540 if(LIB MATCHES "^/")
541 get_filename_component(LIB ${LIB} NAME_WE)
542 string(REGEX REPLACE "^lib" "" LIB ${LIB})
543 endif()
544 set(LIBS "${LIBS} -l${LIB}")
545endforeach()
546CONFIGURE_FILE(libzip/libzip.pc.in libzip/libzip.pc @ONLY)
547INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
548
549ADD_CUSTOM_TARGET(update_zip_err_str
550 COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/make_zip_err_str.sh ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/zip.h ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/zip_err_str.c
551 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/zip.h ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/make_zip_err_str.sh
552)
553
554IF(SHARED_LIB_VERSIONNING)
555SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5)
556ENDIF()
557
558TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARIES} ${OPTIONAL_LIBRARY})
559INSTALL(TARGETS zip
560 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
561 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
562 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
563)
564
diff --git a/externals/libzip/libzip b/externals/libzip/libzip
deleted file mode 160000
Subproject 89bd6d63bdea9da7627695f6c82e54f16d368b5
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 4c01703ca..a59c5a552 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -688,7 +688,7 @@ endif()
688create_target_directory_groups(core) 688create_target_directory_groups(core)
689 689
690target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) 690target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
691target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus zip) 691target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus)
692 692
693if (YUZU_ENABLE_BOXCAT) 693if (YUZU_ENABLE_BOXCAT)
694 target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT) 694 target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT)
HIC SVNT DRACONES