diff --git a/deps/buildcore/base.mk b/deps/buildcore/base.mk index 7b451404..a0857cf8 100644 --- a/deps/buildcore/base.mk +++ b/deps/buildcore/base.mk @@ -32,7 +32,7 @@ ifdef USE_VCPKG ifndef VCPKG_VERSION VCPKG_VERSION=2020.06 endif - VCPKG_TOOLCHAIN=--toolchain=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake + VCPKG_TOOLCHAIN=--toolchain=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake endif ifeq ($(OS),darwin) DEBUGGER=lldb @@ -116,7 +116,7 @@ else # USE_VCPKG .PHONY: setup-conan conan-config: - conan profile new nostalgia --detect --force + conan profile new nostalgia --detect --force ifeq ($(OS),linux) conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME} endif diff --git a/deps/ox/src/ox/claw/read.cpp b/deps/ox/src/ox/claw/read.cpp index c2c4aeee..3f31b207 100644 --- a/deps/ox/src/ox/claw/read.cpp +++ b/deps/ox/src/ox/claw/read.cpp @@ -60,10 +60,9 @@ Result readHeader(const char *buff, std::size_t buffLen) noexcept { } Result stripClawHeader(const char *buff, std::size_t buffLen) noexcept { - auto header = detail::readHeader(buff, buffLen); - oxReturnError(header); - Buffer out(header.value.dataSize); - ox_memcpy(out.data(), header.value.data, out.size()); + oxRequire(header, detail::readHeader(buff, buffLen)); + Buffer out(header.dataSize); + ox_memcpy(out.data(), header.data, out.size()); return move(out); }