Compare commits
6 Commits
release-d2
...
b9ffae0269
Author | SHA1 | Date | |
---|---|---|---|
b9ffae0269 | |||
003f3e01c6 | |||
9028e74af0 | |||
f5ccab5f2c | |||
37cfa927d1 | |||
0efed70b57 |
@@ -275,7 +275,7 @@ bool bgStatus(Context&, unsigned const bg) noexcept {
|
|||||||
|
|
||||||
void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
|
void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
|
||||||
constexpr auto Bg0Status = 8;
|
constexpr auto Bg0Status = 8;
|
||||||
const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
|
auto const mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
|
||||||
REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
|
REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -15,7 +15,7 @@ target_link_libraries(
|
|||||||
|
|
||||||
target_compile_definitions(
|
target_compile_definitions(
|
||||||
NostalgiaStudio PUBLIC
|
NostalgiaStudio PUBLIC
|
||||||
OLYMPIC_APP_VERSION="d2025.06.0"
|
OLYMPIC_APP_VERSION="dev build"
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
|
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>d2025.06.0</string>
|
<string>dev build</string>
|
||||||
|
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>12.0.0</string>
|
<string>12.0.0</string>
|
||||||
|
@@ -635,8 +635,7 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
|
|||||||
keel::DuplicateSet ds;
|
keel::DuplicateSet ds;
|
||||||
OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
|
OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
|
||||||
if (ds.size()) {
|
if (ds.size()) {
|
||||||
ox::String msg;
|
ox::String msg{"Multiple files have the same UUID:\n"};
|
||||||
msg += "Multiple files have the same UUID:\n";
|
|
||||||
for (auto const &k : ds.keys()) {
|
for (auto const &k : ds.keys()) {
|
||||||
msg += ox::sfmt("\n\t{}:\n", k.toString());
|
msg += ox::sfmt("\n\t{}:\n", k.toString());
|
||||||
for (auto const &v : ds[k]) {
|
for (auto const &v : ds[k]) {
|
||||||
|
Reference in New Issue
Block a user