mirror of https://github.com/AxioDL/metaforce.git
Return fixes for MSVC
This commit is contained in:
parent
2699d96989
commit
20677700e0
|
@ -19,7 +19,8 @@ if(MSVC)
|
|||
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/DEBUG /RELEASE /LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:cv,fixup")
|
||||
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wno-multichar -fno-exceptions -Wno-narrowing -Wno-nullability-completeness")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}\
|
||||
-std=c++14 -Wno-multichar -fno-exceptions -Wno-narrowing -Wno-nullability-completeness -Werror=return-type")
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto=thin")
|
||||
|
|
|
@ -165,6 +165,8 @@ bool CGuiTextSupport::CheckAndRebuildRenderBuffer()
|
|||
{
|
||||
zeus::CVector2i extent(x34_extentX, x38_extentY);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void CGuiTextSupport::Render() const
|
||||
|
|
|
@ -546,7 +546,7 @@ void CFrontEndUI::SGBASupportFrame::SetTableColors(CGuiTableGroup* tbgp) const
|
|||
CFrontEndUI::SGBASupportFrame::EAction
|
||||
CFrontEndUI::SGBASupportFrame::ProcessUserInput(const CFinalInput& input, CSaveUI* sui)
|
||||
{
|
||||
|
||||
return EAction::Zero;
|
||||
}
|
||||
|
||||
void CFrontEndUI::SGBASupportFrame::Draw() const
|
||||
|
@ -756,7 +756,7 @@ CFrontEndUI::SOptionsFrontEndFrame::SOptionsFrontEndFrame()
|
|||
|
||||
bool CFrontEndUI::SOptionsFrontEndFrame::ProcessUserInput(const CFinalInput& input, CSaveUI* sui)
|
||||
{
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void CFrontEndUI::SOptionsFrontEndFrame::Draw() const
|
||||
|
|
Loading…
Reference in New Issue