From 00360e89ebccc9e5c0300b2a00379eb08142b965 Mon Sep 17 00:00:00 2001 From: Inori Date: Tue, 17 Dec 2019 19:13:10 -0500 Subject: [PATCH] Use own Boost-Unordered --- .gitmodules | 3 +++ boost-unordered | 1 + meson.build | 3 +++ src/filesystem.mm | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 160000 boost-unordered diff --git a/.gitmodules b/.gitmodules index e69de29b..e20db3ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "boost-unordered"] + path = boost-unordered + url = https://github.com/inori-z/mkxp-z-boost-unordered diff --git a/boost-unordered b/boost-unordered new file mode 160000 index 00000000..87337739 --- /dev/null +++ b/boost-unordered @@ -0,0 +1 @@ +Subproject commit 873377396eb173eebba30b753cb26d18abc2861d diff --git a/meson.build b/meson.build index 75ce9825..e3de53a9 100644 --- a/meson.build +++ b/meson.build @@ -36,6 +36,9 @@ if discord_libpath != '' endif endif +# BOOST UNORDERED +global_include_dirs += include_directories('boost-unordered') + # ==================== # Main source # ==================== diff --git a/src/filesystem.mm b/src/filesystem.mm index dca81917..bb868014 100644 --- a/src/filesystem.mm +++ b/src/filesystem.mm @@ -613,6 +613,7 @@ openReadEnumCB(void *d, const char *dirpath, const char *filename) PHYSFS_File *phys = PHYSFS_openRead(fullPath); + if (!phys) { /* Failing to open this file here means there must @@ -623,7 +624,6 @@ openReadEnumCB(void *d, const char *dirpath, const char *filename) return PHYSFS_ENUM_ERROR; } - initReadOps(phys, data.ops, false); const char *ext = findExt(filename);