Compare commits
6 Commits
d10a71f06d
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| ef1c108b58 | |||
| 6a054cd970 | |||
| 9070e6e109 | |||
| 6cc6e9e7ed | |||
| de859bef77 | |||
| d1a3538e9a |
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.19)
|
cmake_minimum_required(VERSION 3.25)
|
||||||
set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
|
set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
|
||||||
|
|
||||||
if(BUILDCORE_TARGET STREQUAL "gba")
|
if(BUILDCORE_TARGET STREQUAL "gba")
|
||||||
@@ -52,7 +52,7 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
|
|||||||
set(GLFW_BUILD_TESTS OFF)
|
set(GLFW_BUILD_TESTS OFF)
|
||||||
set(GLFW_BUILD_DOCS OFF)
|
set(GLFW_BUILD_DOCS OFF)
|
||||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||||
set(GLFW_BUILD_WAYLAND OFF)
|
set(GLFW_BUILD_WAYLAND ON)
|
||||||
endif()
|
endif()
|
||||||
add_subdirectory(deps/glfw)
|
add_subdirectory(deps/glfw)
|
||||||
add_subdirectory(deps/glutils)
|
add_subdirectory(deps/glutils)
|
||||||
|
|||||||
+2
-2
@@ -261,8 +261,8 @@ Error writeOC(Writer_c auto &writer, auto const &val) noexcept {
|
|||||||
OX_RETURN_ERROR(model(&handler, &val));
|
OX_RETURN_ERROR(model(&handler, &val));
|
||||||
Json::StreamWriterBuilder const jsonBuilder;
|
Json::StreamWriterBuilder const jsonBuilder;
|
||||||
auto const str = Json::writeString(jsonBuilder, ocWriter.m_json);
|
auto const str = Json::writeString(jsonBuilder, ocWriter.m_json);
|
||||||
writer.write(str.data(), str.size());
|
OX_RETURN_ERROR(writer.write(str.data(), str.size()));
|
||||||
return {};
|
return writer.put('\0');
|
||||||
}
|
}
|
||||||
|
|
||||||
Result<Buffer> writeOC(auto const &val) noexcept {
|
Result<Buffer> writeOC(auto const &val) noexcept {
|
||||||
|
|||||||
+2
-2
@@ -38,11 +38,11 @@ constexpr StringView substr(StringViewCR str, std::size_t const start, std::size
|
|||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr char toUpper(char const c) noexcept {
|
constexpr char toUpper(char const c) noexcept {
|
||||||
return c & 0b1101'1111;
|
return c & static_cast<char>(0b1101'1111);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr int caseInsensitiveEquals(ox::StringViewCR a, ox::StringViewCR b) noexcept {
|
constexpr int caseInsensitiveStrCmp(StringViewCR a, StringViewCR b) noexcept {
|
||||||
auto const sz = ox::min(a.size(), b.size());
|
auto const sz = ox::min(a.size(), b.size());
|
||||||
for (size_t i{}; i < sz; ++i) {
|
for (size_t i{}; i < sz; ++i) {
|
||||||
auto const ac = toUpper(a[i]);
|
auto const ac = toUpper(a[i]);
|
||||||
|
|||||||
@@ -54,6 +54,10 @@ struct VectorAllocator {
|
|||||||
// this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
|
// this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
|
||||||
// try removing it later
|
// try removing it later
|
||||||
if (!std::is_constant_evaluated()) {
|
if (!std::is_constant_evaluated()) {
|
||||||
|
#if defined(__GNUC__) && !defined(__clang__)
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wstringop-overflow="
|
||||||
|
#endif
|
||||||
if (cap <= m_data.size() && count <= m_data.size()) {
|
if (cap <= m_data.size() && count <= m_data.size()) {
|
||||||
for (auto i = 0u; i < count; ++i) {
|
for (auto i = 0u; i < count; ++i) {
|
||||||
auto const srcItem = std::launder(reinterpret_cast<T*>(&src->m_data[i]));
|
auto const srcItem = std::launder(reinterpret_cast<T*>(&src->m_data[i]));
|
||||||
@@ -65,6 +69,9 @@ struct VectorAllocator {
|
|||||||
*items = reinterpret_cast<T*>(m_data.data());
|
*items = reinterpret_cast<T*>(m_data.data());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if defined(__GNUC__) && !defined(__clang__)
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,9 +36,9 @@ static void printUsage() noexcept {
|
|||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
static constexpr ox::Result<ox::ClawFormat> getFmt(ox::StringViewCR fmtStr) noexcept {
|
static constexpr ox::Result<ox::ClawFormat> getFmt(ox::StringViewCR fmtStr) noexcept {
|
||||||
if (caseInsensitiveEquals(fmtStr, "mc") == 0) {
|
if (caseInsensitiveStrCmp(fmtStr, "mc") == 0) {
|
||||||
return ox::ClawFormat::Metal;
|
return ox::ClawFormat::Metal;
|
||||||
} else if (caseInsensitiveEquals(fmtStr, "oc") == 0) {
|
} else if (caseInsensitiveStrCmp(fmtStr, "oc") == 0) {
|
||||||
return ox::ClawFormat::Organic;
|
return ox::ClawFormat::Organic;
|
||||||
}
|
}
|
||||||
return ox::Error{1, "invalid format"};
|
return ox::Error{1, "invalid format"};
|
||||||
|
|||||||
Reference in New Issue
Block a user