From 406dff16d1d78741fbe351ab8f6df5509fc18521 Mon Sep 17 00:00:00 2001
From: NoahR02 <noahreppert95@protonmail.com>
Date: Wed, 31 Aug 2022 00:02:23 -0400
Subject: [PATCH] HackStudio: Fix cpp-gui template

---
 Base/res/devel/templates/cpp-gui.postcreate            | 2 +-
 Base/res/devel/templates/cpp-gui/main.cpp              | 2 +-
 Base/res/devel/templates/serenity-application/main.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Base/res/devel/templates/cpp-gui.postcreate b/Base/res/devel/templates/cpp-gui.postcreate
index 141dd4d3b3..b4cdad84f9 100644
--- a/Base/res/devel/templates/cpp-gui.postcreate
+++ b/Base/res/devel/templates/cpp-gui.postcreate
@@ -4,7 +4,7 @@ echo > $2/Makefile <<-EOF
 PROGRAM = $1
 OBJS = main.o
 CXXFLAGS = -g -std=c++2a
-LDFLAGS = -lgui
+LDFLAGS = -lgui -lgcc_s
 
 all: \$(PROGRAM)
 
diff --git a/Base/res/devel/templates/cpp-gui/main.cpp b/Base/res/devel/templates/cpp-gui/main.cpp
index fd17efddf4..4e94601100 100644
--- a/Base/res/devel/templates/cpp-gui/main.cpp
+++ b/Base/res/devel/templates/cpp-gui/main.cpp
@@ -15,7 +15,7 @@ int main(int argc, char** argv)
     auto button = GUI::Button::construct();
     button->set_text("Click me!");
     button->on_click = [&](auto) {
-        GUI::MessageBox::show(window, "Hello friends!", ":^)");
+        GUI::MessageBox::show(window, "Hello friends!"sv, ":^)"sv);
     };
 
     window->set_main_widget(button);
diff --git a/Base/res/devel/templates/serenity-application/main.cpp b/Base/res/devel/templates/serenity-application/main.cpp
index ed6e442826..3c91c8232d 100644
--- a/Base/res/devel/templates/serenity-application/main.cpp
+++ b/Base/res/devel/templates/serenity-application/main.cpp
@@ -28,7 +28,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
     auto button = TRY(main_widget->try_add<GUI::Button>("Click me!"));
     button->on_click = [&](auto) {
-        GUI::MessageBox::show(window, "Hello friends!", ":^)");
+        GUI::MessageBox::show(window, "Hello friends!"sv, ":^)"sv);
     };
 
     window->show();