Mercurial > hg > orthanc-stone

changeset 1902:1cfd602de69d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix wasm build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 29 Jan 2022 18:30:26 +0100
parents 184b0aeae1af
children c7bc9e1776a6
files Applications/Samples/WebAssembly/CMakeLists.txt Applications/Samples/WebAssembly/RtViewer/RtViewerWasm.cpp Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp Applications/StoneWebViewer/WebAssembly/CMakeLists.txt Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp
diffstat 5 files changed, 36 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/WebAssembly/CMakeLists.txt	Sat Jan 29 16:55:14 2022 +0100
+++ b/Applications/Samples/WebAssembly/CMakeLists.txt	Sat Jan 29 18:30:26 2022 +0100
@@ -58,7 +58,7 @@
 # ---------------------------------------------------------------
 set(ALLOW_DOWNLOADS ON)
 
-include(${CMAKE_SOURCE_DIR}/../../Platforms/WebAssembly/OrthancStoneWebAssemblyParameters.cmake)
+include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/CMake/OrthancStoneWebAssemblyParameters.cmake)
 
 SET(ENABLE_DCMTK OFF)  # Not necessary
 SET(ENABLE_GOOGLE_TEST OFF)
@@ -67,7 +67,7 @@
 
 # this will set up the build system for Stone of Orthanc and will
 # populate the ORTHANC_STONE_SOURCES CMake variable
-include(${CMAKE_SOURCE_DIR}/../../Platforms/WebAssembly/OrthancStoneWebAssemblyConfiguration.cmake)
+include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/CMake/OrthancStoneWebAssemblyConfiguration.cmake)
 
 
 # We embed a font to be used for on-screen overlays
--- a/Applications/Samples/WebAssembly/RtViewer/RtViewerWasm.cpp	Sat Jan 29 16:55:14 2022 +0100
+++ b/Applications/Samples/WebAssembly/RtViewer/RtViewerWasm.cpp	Sat Jan 29 18:30:26 2022 +0100
@@ -24,10 +24,10 @@
 #include "../../Common/SampleHelpers.h"
 
 // Stone of Orthanc includes
+#include "../../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyLoadersContext.h"
+#include "../../../../OrthancStone/Sources/Platforms/WebAssembly/WebGLViewport.h"
 #include "../../../../OrthancStone/Sources/StoneException.h"
 #include "../../../../OrthancStone/Sources/StoneInitialization.h"
-#include "../../../Platforms/WebAssembly/WebAssemblyLoadersContext.h"
-#include "../../../Platforms/WebAssembly/WebGLViewport.h"
 
 #include <Toolbox.h>
 
--- a/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Sat Jan 29 16:55:14 2022 +0100
+++ b/Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Sat Jan 29 18:30:26 2022 +0100
@@ -22,11 +22,11 @@
 
 #include "SingleFrameViewerApplication.h"
 
+#include "../../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyLoadersContext.h"
+#include "../../../../OrthancStone/Sources/Platforms/WebAssembly/WebGLViewport.h"
+#include "../../../../OrthancStone/Sources/Platforms/WebAssembly/WebGLViewportsRegistry.h"
 #include "../../../../OrthancStone/Sources/StoneException.h"
 #include "../../../../OrthancStone/Sources/StoneInitialization.h"
-#include "../../../Platforms/WebAssembly/WebGLViewport.h"
-#include "../../../Platforms/WebAssembly/WebAssemblyLoadersContext.h"
-#include "../../../Platforms/WebAssembly/WebGLViewportsRegistry.h"
 
 #include <Compatibility.h>  // For std::unique_ptr<>
 #include <Toolbox.h>
--- a/Applications/StoneWebViewer/WebAssembly/CMakeLists.txt	Sat Jan 29 16:55:14 2022 +0100
+++ b/Applications/StoneWebViewer/WebAssembly/CMakeLists.txt	Sat Jan 29 18:30:26 2022 +0100
@@ -49,7 +49,7 @@
 # ---------------------------------------------------------------
 set(ALLOW_DOWNLOADS ON)
 
-include(${CMAKE_SOURCE_DIR}/../../Platforms/WebAssembly/OrthancStoneWebAssemblyParameters.cmake)
+include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/CMake/OrthancStoneWebAssemblyParameters.cmake)
 
 SET(ENABLE_DCMTK ON)
 SET(ENABLE_DCMTK_NETWORKING OFF)
@@ -61,12 +61,7 @@
 
 # this will set up the build system for Stone of Orthanc and will
 # populate the ORTHANC_STONE_SOURCES CMake variable
-include(${CMAKE_SOURCE_DIR}/../../Platforms/WebAssembly/OrthancStoneWebAssemblyConfiguration.cmake)
-
-include_directories(
-  ${CMAKE_SOURCE_DIR}/../../../OrthancStone/Sources/
-  ${CMAKE_SOURCE_DIR}/../../Platforms/WebAssembly/
-  )
+include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/CMake/OrthancStoneWebAssemblyConfiguration.cmake)
 
 if (CMAKE_BUILD_TYPE MATCHES Debug)
   # specific flags go here
--- a/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Sat Jan 29 16:55:14 2022 +0100
+++ b/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Sat Jan 29 18:30:26 2022 +0100
@@ -65,35 +65,35 @@
 #include <Logging.h>
 
 // Stone includes
-#include <Loaders/DicomResourcesLoader.h>
-#include <Loaders/SeriesMetadataLoader.h>
-#include <Loaders/SeriesThumbnailsLoader.h>
-#include <Messages/ObserverBase.h>
-#include <Oracle/ParseDicomFromWadoCommand.h>
-#include <Oracle/ParseDicomSuccessMessage.h>
-#include <Scene2D/AnnotationsSceneLayer.h>
-#include <Scene2D/ArrowSceneLayer.h>
-#include <Scene2D/ColorTextureSceneLayer.h>
-#include <Scene2D/FloatTextureSceneLayer.h>
-#include <Scene2D/MacroSceneLayer.h>
-#include <Scene2D/OsiriXLayerFactory.h>
-#include <Scene2D/PolylineSceneLayer.h>
-#include <Scene2D/TextSceneLayer.h>
-#include <Scene2DViewport/ViewportController.h>
-#include <StoneException.h>
-#include <Toolbox/DicomInstanceParameters.h>
-#include <Toolbox/GeometryToolbox.h>
-#include <Toolbox/OsiriX/AngleAnnotation.h>
-#include <Toolbox/OsiriX/CollectionOfAnnotations.h>
-#include <Toolbox/OsiriX/LineAnnotation.h>
-#include <Toolbox/OsiriX/TextAnnotation.h>
-#include <Toolbox/SortedFrames.h>
-#include <Viewport/DefaultViewportInteractor.h>
+#include "../../../OrthancStone/Sources/Loaders/DicomResourcesLoader.h"
+#include "../../../OrthancStone/Sources/Loaders/SeriesMetadataLoader.h"
+#include "../../../OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.h"
+#include "../../../OrthancStone/Sources/Messages/ObserverBase.h"
+#include "../../../OrthancStone/Sources/Oracle/ParseDicomFromWadoCommand.h"
+#include "../../../OrthancStone/Sources/Oracle/ParseDicomSuccessMessage.h"
+#include "../../../OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/ArrowSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/ColorTextureSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/FloatTextureSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/MacroSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/OsiriXLayerFactory.h"
+#include "../../../OrthancStone/Sources/Scene2D/PolylineSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2D/TextSceneLayer.h"
+#include "../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h"
+#include "../../../OrthancStone/Sources/StoneException.h"
+#include "../../../OrthancStone/Sources/Toolbox/DicomInstanceParameters.h"
+#include "../../../OrthancStone/Sources/Toolbox/GeometryToolbox.h"
+#include "../../../OrthancStone/Sources/Toolbox/OsiriX/AngleAnnotation.h"
+#include "../../../OrthancStone/Sources/Toolbox/OsiriX/CollectionOfAnnotations.h"
+#include "../../../OrthancStone/Sources/Toolbox/OsiriX/LineAnnotation.h"
+#include "../../../OrthancStone/Sources/Toolbox/OsiriX/TextAnnotation.h"
+#include "../../../OrthancStone/Sources/Toolbox/SortedFrames.h"
+#include "../../../OrthancStone/Sources/Viewport/DefaultViewportInteractor.h"
 
 // WebAssembly includes
-#include <WebAssemblyCairoViewport.h>
-#include <WebAssemblyLoadersContext.h>
-#include <WebGLViewport.h>
+#include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyCairoViewport.h"
+#include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyLoadersContext.h"
+#include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebGLViewport.h"
 
 
 #include <boost/math/special_functions/round.hpp>