jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix windows compilation.

Browse source
This commit is contained in:
jmsgrogan 2022-11-30 20:53:17 +00:00
parent b45385e8c7
commit b17ba8b3a7
23 changed files with 85 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/sample-gui/gui-main-win.cpp
View file

@ -31,7 +31,7 @@ void initializeCommandLineArgs(CommandLineArgs* args)
}
LocalFree(szArglist);
args->Process(windowsArgs);
args->process(windowsArgs);
}
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow)
@ -39,9 +39,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
std::ofstream out("out.txt");
std::cout.rdbuf(out.rdbuf());
auto args = CommandLineArgs::CreateUnique();
auto args = CommandLineArgs::Create();
initializeCommandLineArgs(args.get());
args->RecordLaunchPath();
args->recordLaunchPath();
// Start the main app
auto main_app = MainApplication::Create();
@ -50,18 +50,18 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
applicationContext->hInstance = reinterpret_cast<void*>(hInstance);
applicationContext->nCmdShow = nCmdShow;
main_app->Initialize(std::move(args), std::move(applicationContext));
main_app->initialize(std::move(args), std::move(applicationContext));
MLOG_INFO("Creating GUI Application");
// Start the gui application
auto gui_app = GuiApplication();
gui_app.SetMainApplication(main_app);
//gui_app.setMainApplication(main_app);
MLOG_INFO("Running GUI Application");
gui_app.Run();
gui_app.run();
main_app->ShutDown();
main_app->shutDown();
return 0;
}