Compare commits

..

No commits in common. "03a05c511ea39232e65ff1464281535343676286" and "161640fa11986677dc2e1da6ffd4575e38ab31ad" have entirely different histories.

5 changed files with 4 additions and 5 deletions

View File

@ -92,7 +92,7 @@ static class: public keel::Module {
},
};
}
} const mod;
} mod;
keel::Module const*keelModule() noexcept {
return &mod;

View File

@ -258,7 +258,7 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
}
if (newName) {
std::ignore = pushCommand<UpdateColorInfoCommand>(
m_pal, m_selectedColorRow, static_cast<ox::String>(newName.text));
m_pal, m_selectedColorRow, ox::String{newName});
}
}

View File

@ -25,7 +25,7 @@ static class: public studio::Module {
out.emplace_back(ox::make<studio::ItemMakerT<core::Palette>>("Palette", "Palettes", FileExt_npal));
return out;
}
} const mod;
} mod;
const studio::Module *studioModule() noexcept {
return &mod;

View File

@ -50,7 +50,7 @@ void registerKeelModules() noexcept;
void registerStudioModules() noexcept;
}
#if defined(_WIN32) && OLYMPIC_GUI_APP
#ifdef _WIN32
int WinMain() {
auto const argc = __argc;
auto const argv = const_cast<const char**>(__argv);

View File

@ -12,7 +12,6 @@ add_library(
)
target_compile_definitions(
StudioAppLib PUBLIC
OLYMPIC_GUI_APP=1
OLYMPIC_LOAD_STUDIO_MODULES=1
OLYMPIC_APP_NAME="Studio"
)