drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[buildcore] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2021-04-28 23:24:42 -05:00
parent 42aa518450
commit 8ffc2830ae
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/buildcore/base.mk vendored
View File

@ -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

7
deps/ox/src/ox/claw/read.cpp vendored
View File

@ -60,10 +60,9 @@ Result<ClawHeader> readHeader(const char *buff, std::size_t buffLen) noexcept {
}
Result<Buffer> 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);
}