changeset 1461:a36b2c684e59

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Jun 2020 21:27:17 +0200
parents fbc5bfde6c95 (diff) 5a6c76797b60 (current diff)
children b17d03599726
files
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Deprecated/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h	Thu Jun 11 21:26:34 2020 +0200
+++ b/Deprecated/Applications/Samples/Deprecated/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.h	Thu Jun 11 21:27:17 2020 +0200
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <string>
-#include <Framework/Messages/IObserver.h>
+#include "../../../../../../Framework/Messages/IObserver.h"
 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>
 
 #include "../../SimpleViewerApplication.h"
@@ -40,4 +40,4 @@
 
     };
 
-}
\ No newline at end of file
+}
--- a/Deprecated/Platforms/Wasm/Defaults.cpp	Thu Jun 11 21:26:34 2020 +0200
+++ b/Deprecated/Platforms/Wasm/Defaults.cpp	Thu Jun 11 21:27:17 2020 +0200
@@ -23,8 +23,8 @@
 
 #include "WasmWebService.h"
 #include "WasmDelayedCallExecutor.h"
-#include "../../Framework/Deprecated/Widgets/TestCairoWidget.h"
-#include <Framework/Deprecated/Viewport/WidgetViewport.h>
+#include "../../../Framework/Deprecated/Widgets/TestCairoWidget.h"
+#include "../../../Framework/Deprecated/Viewport/WidgetViewport.h"
 #include <Applications/Wasm/StartupParametersBuilder.h>
 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>
 #include <Framework/StoneInitialization.h>
--- a/Deprecated/Platforms/Wasm/WasmPlatformApplicationAdapter.h	Thu Jun 11 21:26:34 2020 +0200
+++ b/Deprecated/Platforms/Wasm/WasmPlatformApplicationAdapter.h	Thu Jun 11 21:27:17 2020 +0200
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <string>
-#include <Framework/Messages/IObserver.h>
+#include "../../../Framework/Messages/IObserver.h"
 #include <Applications/IStoneApplication.h>
 
 namespace OrthancStone