--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Framework/StoneInitialization.cpp	Tue Apr 30 09:17:45 2019 +0200
@@ -0,0 +1,55 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "StoneInitialization.h"
+
+#include <Core/Logging.h>
+
+#if !defined(ORTHANC_ENABLE_SDL)
+#  error Macro ORTHANC_ENABLE_SDL must be defined
+#endif
+
+
+#if ORTHANC_ENABLE_SDL == 1
+#  include "../Applications/Sdl/SdlWindow.h"
+#endif
+
+
+namespace OrthancStone
+{
+  void StoneInitialize()
+  {
+    Orthanc::Logging::Initialize();
+
+#if ORTHANC_ENABLE_SDL == 1
+    OrthancStone::SdlWindow::GlobalInitialize();
+#endif
+  }
+
+  void StoneFinalize()
+  {
+#if ORTHANC_ENABLE_SDL == 1
+    OrthancStone::SdlWindow::GlobalFinalize();
+#endif
+    
+    Orthanc::Logging::Finalize();
+  }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Framework/StoneInitialization.h	Tue Apr 30 09:17:45 2019 +0200
@@ -0,0 +1,29 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+namespace OrthancStone
+{
+  void StoneInitialize();
+
+  void StoneFinalize();
+}

--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Apr 30 07:54:51 2019 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Apr 30 09:17:45 2019 +0200
@@ -320,6 +320,7 @@
   ${ORTHANC_STONE_ROOT}/Framework/SmartLoader.cpp
   ${ORTHANC_STONE_ROOT}/Framework/StoneEnumerations.cpp
   ${ORTHANC_STONE_ROOT}/Framework/StoneException.h
+  ${ORTHANC_STONE_ROOT}/Framework/StoneInitialization.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/AffineTransform2D.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/BaseWebService.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/CoordinateSystem3D.cpp

--- a/Samples/Sdl/BasicScene.cpp	Tue Apr 30 07:54:51 2019 +0200
+++ b/Samples/Sdl/BasicScene.cpp	Tue Apr 30 09:17:45 2019 +0200
@@ -22,12 +22,13 @@
 // From Stone
 #include "../../Applications/Sdl/SdlOpenGLWindow.h"
 #include "../../Framework/Scene2D/CairoCompositor.h"
+#include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
 #include "../../Framework/Scene2D/OpenGLCompositor.h"
-#include "../../Framework/Scene2D/Scene2D.h"
 #include "../../Framework/Scene2D/PanSceneTracker.h"
 #include "../../Framework/Scene2D/RotateSceneTracker.h"
+#include "../../Framework/Scene2D/Scene2D.h"
 #include "../../Framework/Scene2D/ZoomSceneTracker.h"
-#include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
+#include "../../Framework/StoneInitialization.h"
 
 // From Orthanc framework
 #include <Core/Logging.h>
@@ -357,8 +358,7 @@
  **/
 int main(int argc, char* argv[])
 {
-  Orthanc::Logging::Initialize();
-  OrthancStone::SdlWindow::GlobalInitialize();
+  OrthancStone::StoneInitialize();
 
   try
   {
@@ -371,8 +371,7 @@
     LOG(ERROR) << "EXCEPTION: " << e.What();
   }
 
-  OrthancStone::SdlWindow::GlobalFinalize();
-  Orthanc::Logging::Finalize();
+  OrthancStone::StoneFinalize();
 
   return 0;
 }