--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake	Tue Jun 09 16:40:43 2020 +0200
+++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake	Tue Jun 09 20:50:20 2020 +0200
@@ -604,36 +604,6 @@
   add_definitions(-DORTHANC_ENABLE_LOGGING_STDIO=0)
 endif()
 
-      
-if (HAS_EMBEDDED_RESOURCES)
-  add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=1)
-
-  if (ENABLE_WEB_SERVER)
-    list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
-      ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp
-      )
-  endif()
-
-elseif (STANDALONE_BUILD)
-  # No embedded resources are provided by the external project, but
-  # some are required by the Orthanc framework (DCMTK and ICU)
-  add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=1)
-
-  EmbedResources(
-    ${DCMTK_DICTIONARIES}
-    ${LIBICU_RESOURCES}
-    )
-
-  list(APPEND ORTHANC_DICOM_SOURCES_DEPENDENCIES
-    ${AUTOGENERATED_SOURCES}
-    )
-  
-else()
-  # Neither the external project, nor the Orthanc framework have to
-  # embed external resources
-  add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=0)
-endif()
-
 
 
 #####################################################################
@@ -706,6 +676,13 @@
 endif()
 
 
+if (NOT ORTHANC_BUILDING_FRAMEWORK_LIBRARY)
+  list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
+    ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp
+    )
+endif()
+
+
 set(ORTHANC_CORE_SOURCES
   ${ORTHANC_CORE_SOURCES_INTERNAL}
   ${ORTHANC_CORE_SOURCES_DEPENDENCIES}