...

4 files changed, 9 insertions, 7 deletions

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index f3b4afde..17a8fbed 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -1,8 +1,6 @@
 add_library(cru_demo_base INTERFACE)
 
-if(WIN32)
-	target_link_libraries(cru_demo_base INTERFACE cru_win_gui)
-endif()
+target_link_libraries(cru_demo_base INTERFACE cru_platform_boostrap)
 
 if(WIN32) # Currently only enable tests on Windows.
 	add_subdirectory(main)
diff --git a/demos/input_method/main.cpp b/demos/input_method/main.cpp
index 5a6dc942..b509cd97 100644
--- a/demos/input_method/main.cpp
+++ b/demos/input_method/main.cpp
@@ -1,3 +1,4 @@
+#include "cru/platform/bootstrap/Bootstrap.hpp"
 #include "cru/platform/graphics/Factory.hpp"
 #include "cru/platform/graphics/Font.hpp"
 #include "cru/platform/graphics/Painter.hpp"
@@ -10,7 +11,7 @@ int main() {
   using namespace cru::platform::graphics;
   using namespace cru::platform::gui;
 
-  auto application = CreateUiApplication();
+  IUiApplication* application = boostrap::CreateUiApplication();
 
   auto graph_factory = application->GetGraphFactory();
 
diff --git a/demos/main/main.cpp b/demos/main/main.cpp
index 541a2320..af2625a9 100644
--- a/demos/main/main.cpp
+++ b/demos/main/main.cpp
@@ -1,4 +1,5 @@
 #include "cru/platform/HeapDebug.hpp"
+#include "cru/platform/bootstrap/Bootstrap.hpp"
 #include "cru/platform/gui/UiApplication.hpp"
 #include "cru/platform/gui/Window.hpp"
 #include "cru/ui/Base.hpp"
@@ -9,7 +10,7 @@
 #include "cru/ui/controls/Window.hpp"
 #include "cru/ui/host/WindowHost.hpp"
 
-using cru::platform::gui::CreateUiApplication;
+using cru::platform::gui::IUiApplication;
 using cru::ui::controls::Button;
 using cru::ui::controls::FlexLayout;
 using cru::ui::controls::TextBlock;
@@ -21,7 +22,7 @@ int main() {
   cru::platform::SetupHeapDebug();
 #endif
 
-  auto application = CreateUiApplication();
+  IUiApplication* application = cru::platform::boostrap::CreateUiApplication();
 
   const auto window = Window::Create();
 
diff --git a/demos/scroll_view/main.cpp b/demos/scroll_view/main.cpp
index f6b29934..2d65f68f 100644
--- a/demos/scroll_view/main.cpp
+++ b/demos/scroll_view/main.cpp
@@ -1,14 +1,16 @@
+#include "cru/platform/bootstrap/Bootstrap.hpp"
 #include "cru/platform/gui/UiApplication.hpp"
 #include "cru/ui/controls/ScrollView.hpp"
 #include "cru/ui/controls/TextBlock.hpp"
 #include "cru/ui/controls/Window.hpp"
 
+using cru::platform::gui::IUiApplication;
 using cru::ui::controls::ScrollView;
 using cru::ui::controls::TextBlock;
 using cru::ui::controls::Window;
 
 int main() {
-  auto application = cru::platform::gui::CreateUiApplication();
+  IUiApplication* application = cru::platform::boostrap::CreateUiApplication();
 
   auto window = Window::Create();