Mercurial > hg > orthanc-stone
comparison Platforms/Wasm/Defaults.cpp @ 860:238693c3bc51 am-dev
merge default -> am-dev
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 24 Jun 2019 14:35:00 +0200 |
parents | 997290c7d537 c35e98d22764 |
children | f7e5ee59ba17 |
comparison
equal
deleted
inserted
replaced
856:a6e17a5a39e7 | 860:238693c3bc51 |
---|---|
1 #include "Defaults.h" | 1 #include "Defaults.h" |
2 | 2 |
3 #include "WasmWebService.h" | 3 #include "WasmWebService.h" |
4 #include "WasmDelayedCallExecutor.h" | 4 #include "WasmDelayedCallExecutor.h" |
5 #include <Framework/dev.h> | 5 #include "../../Framework/Deprecated/Widgets/TestCairoWidget.h" |
6 #include "Framework/Widgets/TestCairoWidget.h" | 6 #include <Framework/Deprecated/Viewport/WidgetViewport.h> |
7 #include <Framework/Viewport/WidgetViewport.h> | |
8 #include <Applications/Wasm/StartupParametersBuilder.h> | 7 #include <Applications/Wasm/StartupParametersBuilder.h> |
9 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h> | 8 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h> |
10 #include <Core/Logging.h> | 9 #include <Core/Logging.h> |
11 | 10 |
12 #include <algorithm> | 11 #include <algorithm> |