[loader] external zbic + code tweaks + ci workarounds

cpmfile.json

@@ -338,6 +338,11 @@
         "repo": "herumi/xbyak",
         "version": "v7.40.1"
     },
+    "zbic": {
+        "hash": "fbe2f37986377d7f0d96ae3224c80b5971df6e8b6961f68061f1975ebb2e8cb78f07b90f014b007be4023dbf5513581504e7f7d61a5237cb2a8a7a61ae11e482",
+        "repo": "kinnay/zbic",
+        "version": "11b08f2712264bbed731545085cbd9702096ceb7"
+    },
     "zlib": {
         "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
         "min_version": "1.2",

externals/CMakeLists.txt

@@ -48,9 +48,9 @@ if (NOT TARGET stb::headers)
     add_library(stb::headers ALIAS stb)
 endif()
 
-AddJsonPackage(NAME atmosphere_zstd_bic DOWNLOAD_ONLY)
-set(ATMOSPHERE_ZSTD_BIC_INCLUDE_DIR
-    "${atmosphere_zstd_bic_SOURCE_DIR}/libraries/libstratosphere/source/util"
+AddJsonPackage(NAME zbic DOWNLOAD_ONLY)
+set(ZBIC_INCLUDE_DIR
+    "${zbic_SOURCE_DIR}/src"
     PARENT_SCOPE)
 
 # ItaniumDemangle (Windows only)

src/common/CMakeLists.txt

@@ -150,8 +150,8 @@ add_library(
     container/unordered_map.h container/unordered_set.h)
 
 set_source_files_properties(zbic_compression.cpp PROPERTIES
-    INCLUDE_DIRECTORIES "${ATMOSPHERE_ZSTD_BIC_INCLUDE_DIR}"
-    COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function>")
+    INCLUDE_DIRECTORIES "${ZBIC_INCLUDE_DIR}"
+    COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function;-Wno-missing-declarations;-Wno-shadow>")
 
 if(WIN32)
     target_sources(common PRIVATE windows/timer_resolution.cpp

src/common/zbic_compression.cpp

@@ -12,8 +12,14 @@
 #define ZSTDERRORLIB_HIDDEN static
 #undef ZSTD_MULTITHREAD
 
+#if defined(__ANDROID__)
+#undef _GNU_SOURCE
+#endif
+
 #include "zstd.h"
-#include "zstd.inc"
+#define g_ZSTD_threading_useless_symbol g_ZSTD_zbic_threading_useless_symbol
+#include "zstd.c"
+#undef g_ZSTD_threading_useless_symbol
 
 namespace Common::Compression {