From 9ee047cfb9274fd4f545a0dc96844c2d3b335624 Mon Sep 17 00:00:00 2001 From: Nikolay Zapolnov Date: Wed, 4 Jun 2025 18:32:45 +0300 Subject: [PATCH 1/2] Make it possible to run ruisapp both as console and GUI app. --- src/ruisapp/glue/windows/glue.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ruisapp/glue/windows/glue.cxx b/src/ruisapp/glue/windows/glue.cxx index b5131c6b..8f0da93e 100644 --- a/src/ruisapp/glue/windows/glue.cxx +++ b/src/ruisapp/glue/windows/glue.cxx @@ -821,8 +821,14 @@ int WINAPI WinMain( int n_cmd_show // Window Show State ) { - // TODO: pass argc and argv - ruisapp::winmain(0, nullptr); + ruisapp::winmain(__argc, (const char**)__argv); + + return 0; +} + +int main(int argc, char** argv) +{ + ruisapp::winmain(argc, (const char**)argv); return 0; } From 8e92060757ed3a05638f19d63f921aaa4d27e846 Mon Sep 17 00:00:00 2001 From: Nikolay Zapolnov Date: Thu, 5 Jun 2025 20:37:50 +0300 Subject: [PATCH 2/2] Fix argv casts. --- src/ruisapp/glue/windows/glue.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ruisapp/glue/windows/glue.cxx b/src/ruisapp/glue/windows/glue.cxx index 8f0da93e..35618964 100644 --- a/src/ruisapp/glue/windows/glue.cxx +++ b/src/ruisapp/glue/windows/glue.cxx @@ -821,14 +821,14 @@ int WINAPI WinMain( int n_cmd_show // Window Show State ) { - ruisapp::winmain(__argc, (const char**)__argv); + ruisapp::winmain(__argc, const_cast(__argv)); return 0; } -int main(int argc, char** argv) +int main(int argc, const char** argv) { - ruisapp::winmain(argc, (const char**)argv); + ruisapp::winmain(argc, argv); return 0; }