Mercurial > hg > orthanc-stone

changeset 1411:08fd094f9582

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 04 May 2020 13:34:46 +0200
parents b2b0fc4a5596 (diff) 07fac4fdbe07 (current diff)
children 0cbc85e0c583 cde379b9d1d2 4f2e14275b09
files
diffstat 4 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Deprecated/Applications/Generic/GuiAdapter.cpp	Mon May 04 13:18:06 2020 +0200
+++ b/Deprecated/Applications/Generic/GuiAdapter.cpp	Mon May 04 13:34:46 2020 +0200
@@ -21,7 +21,7 @@
 #include "GuiAdapter.h"
 
 #if ORTHANC_ENABLE_OPENGL == 1
-#  include "../../Framework/OpenGL/OpenGLIncludes.h"
+#  include "../../../Framework/OpenGL/OpenGLIncludes.h"
 #endif
 
 #if ORTHANC_ENABLE_SDL == 1
@@ -31,7 +31,7 @@
 #endif
 
 #if ORTHANC_ENABLE_THREADS == 1
-#  include "../../Framework/Deprecated/Messages/LockingEmitter.h"
+#  include "../../../Framework/Deprecated/Messages/LockingEmitter.h"
 #endif
 
 #include <Core/Compatibility.h>
--- a/Deprecated/Applications/Generic/GuiAdapter.h	Mon May 04 13:18:06 2020 +0200
+++ b/Deprecated/Applications/Generic/GuiAdapter.h	Mon May 04 13:34:46 2020 +0200
@@ -41,10 +41,10 @@
 # endif
 #endif
 
-#include "../../Framework/StoneException.h"
+#include "../../../Framework/StoneException.h"
 
 #if ORTHANC_ENABLE_THREADS == 1
-# include "../../Framework/Deprecated/Messages/LockingEmitter.h"
+# include "../../../Framework/Deprecated/Messages/LockingEmitter.h"
 #endif
 
 #include <vector>
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Mon May 04 13:18:06 2020 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Mon May 04 13:34:46 2020 +0200
@@ -287,6 +287,15 @@
     )
 endif()
 
+if ( (ENABLE_SDL OR ENABLE_WASM) AND ENABLE_GUIADAPTER )
+  list(APPEND APPLICATIONS_SOURCES
+    ${ORTHANC_STONE_ROOT}/Deprecated/Applications/Generic/GuiAdapter.cpp
+    ${ORTHANC_STONE_ROOT}/Deprecated/Applications/Generic/GuiAdapter.h
+    )
+    include_directories(${ORTHANC_STONE_ROOT}/Deprecated)
+endif()
+
+
 list(APPEND ORTHANC_STONE_SOURCES
 
   ${ORTHANC_ROOT}/Plugins/Samples/Common/DicomDatasetReader.cpp
@@ -595,7 +604,6 @@
   endif()
 endif()
 
-
 ##
 ## TEST - Automatically add all ".h" headers to the list of sources
 ##
--- a/Resources/CMake/OrthancStoneParameters.cmake	Mon May 04 13:18:06 2020 +0200
+++ b/Resources/CMake/OrthancStoneParameters.cmake	Mon May 04 13:34:46 2020 +0200
@@ -55,3 +55,5 @@
 set(ENABLE_OPENGL ON CACHE BOOL "Enable support of OpenGL")
 set(ENABLE_WASM OFF CACHE INTERNAL "Enable support of WebAssembly")
 set(ENABLE_STONE_DEPRECATED OFF CACHE INTERNAL "Enable backward compatibility with deprecated Stone classes")
+set(ENABLE_GUIADAPTER OFF CACHE INTERNAL "Enable backward compatibility with the Stone GuiAdapter class")
+