Mercurial > hg > orthanc-stone

comparison Framework/StoneInitialization.cpp @ 1455:30deba7bc8e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplifying include_directories
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Jun 2020 20:54:01 +0200
parents 1c2d065ba372
children
comparison
equal deleted inserted replaced
1454:faaff0a1711e 1455:30deba7bc8e2
43 #if ORTHANC_ENABLE_SDL == 1 43 #if ORTHANC_ENABLE_SDL == 1
44 # include "Viewport/SdlWindow.h" 44 # include "Viewport/SdlWindow.h"
45 #endif 45 #endif
46 46
47 #if ORTHANC_ENABLE_CURL == 1 47 #if ORTHANC_ENABLE_CURL == 1
48 # include <Core/HttpClient.h> 48 # include <HttpClient.h>
49 #endif 49 #endif
50 50
51 #if ORTHANC_ENABLE_DCMTK == 1 51 #if ORTHANC_ENABLE_DCMTK == 1
52 # include <Core/DicomParsing/FromDcmtkBridge.h> 52 # include <DicomParsing/FromDcmtkBridge.h>
53 #endif 53 #endif
54 54
55 #if ORTHANC_ENABLE_WASM == 1 55 #if ORTHANC_ENABLE_WASM == 1
56 static double viewportsTimeout_ = 1000; 56 static double viewportsTimeout_ = 1000;
57 static std::unique_ptr<OrthancStone::WebGLViewportsRegistry> viewportsRegistry_; 57 static std::unique_ptr<OrthancStone::WebGLViewportsRegistry> viewportsRegistry_;
58 #endif 58 #endif
59 59
60 #include "Toolbox/LinearAlgebra.h" 60 #include "Toolbox/LinearAlgebra.h"
61 61
62 #include <Core/OrthancException.h> 62 #include <Logging.h>
63 #include <Core/Toolbox.h> 63 #include <OrthancException.h>
64 #include <Toolbox.h>
64 65
65 #include <locale> 66 #include <locale>
66 67
67 68
68 namespace OrthancStone 69 namespace OrthancStone
69 { 70 {
70 #if ORTHANC_ENABLE_LOGGING_PLUGIN == 1 71 void StoneInitialize(void* pluginContext)
71 void StoneInitialize(OrthancPluginContext* context) 72 {
72 #else 73 if (pluginContext != NULL)
73 void StoneInitialize() 74 {
74 #endif 75 Orthanc::Logging::InitializePluginContext(pluginContext);
75 { 76 }
76 #if ORTHANC_ENABLE_LOGGING_PLUGIN == 1 77 else
77 Orthanc::Logging::Initialize(context); 78 {
78 #else 79 Orthanc::Logging::Initialize();
79 Orthanc::Logging::Initialize(); 80 }
80 #endif
81 81
82 #if ORTHANC_ENABLE_SSL == 1 82 #if ORTHANC_ENABLE_SSL == 1
83 // Must be before curl 83 // Must be before curl
84 Orthanc::Toolbox::InitializeOpenSsl(); 84 Orthanc::Toolbox::InitializeOpenSsl();
85 #endif 85 #endif