--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Thu Aug 30 17:17:11 2018 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Sep 04 15:09:42 2018 +0200
@@ -164,6 +164,10 @@
 set(APPLICATIONS_SOURCES
     ${ORTHANC_STONE_ROOT}/Applications/IStoneApplication.h
     ${ORTHANC_STONE_ROOT}/Applications/StoneApplicationContext.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/Commands/BaseCommandFactory.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/Commands/ICommand.h
+    ${ORTHANC_STONE_ROOT}/Applications/Commands/ICommandExecutor.h
+    ${ORTHANC_STONE_ROOT}/Applications/Commands/ICommandFactory.h
     )
 
 if (NOT ORTHANC_SANDBOXED)
@@ -190,7 +194,7 @@
         )
     endif()
   endif()
-else()
+elseif (ENABLE_WASM)
   list(APPEND APPLICATIONS_SOURCES
     ${ORTHANC_STONE_ROOT}/Applications/Wasm/StartupParametersBuilder.cpp
     )
@@ -200,7 +204,20 @@
     ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmWebService.cpp
     ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmViewport.cpp
     ${ORTHANC_STONE_ROOT}/Platforms/Wasm/IStoneApplicationToWebApplicationAdapter.h
+    ${AUTOGENERATED_DIR}/WasmWebService.c
+    ${AUTOGENERATED_DIR}/default-library.c
   )
+
+  # Regenerate a dummy "WasmWebService.c" file each time the "WasmWebService.js" file
+  # is modified, so as to force a new execution of the linking
+  add_custom_command(
+    OUTPUT "${AUTOGENERATED_DIR}/WasmWebService.c"
+    COMMAND ${CMAKE_COMMAND} -E touch "${AUTOGENERATED_DIR}/WasmWebService.c" ""
+    DEPENDS "${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmWebService.js")
+  add_custom_command(
+    OUTPUT "${AUTOGENERATED_DIR}/default-library.c"
+    COMMAND ${CMAKE_COMMAND} -E touch "${AUTOGENERATED_DIR}/default-library.c" ""
+    DEPENDS "${ORTHANC_STONE_ROOT}/Platforms/Wasm/default-library.js")
 endif()
 
 list(APPEND ORTHANC_STONE_SOURCES
@@ -209,6 +226,8 @@
   #${ORTHANC_STONE_ROOT}/Framework/Layers/SingleFrameRendererFactory.cpp
   ${ORTHANC_STONE_ROOT}/Framework/StoneEnumerations.cpp
   ${ORTHANC_STONE_ROOT}/Framework/SmartLoader.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/dev.h
+  ${ORTHANC_STONE_ROOT}/Framework/StoneException.h
   ${ORTHANC_STONE_ROOT}/Framework/Layers/CircleMeasureTracker.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Layers/ColorFrameRenderer.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Layers/DicomStructureSetRendererFactory.cpp