--- a/Resources/ThirdParty/icu/CMakeLists.txt	Fri Feb 15 17:26:45 2019 +0100
+++ b/Resources/ThirdParty/icu/CMakeLists.txt	Sat Feb 16 00:31:35 2019 +0100
@@ -1,7 +1,17 @@
+# Legacy version using LSB:
+# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../../LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_LIBICU=ON -G Ninja && ninja
+
+# Newest release of icu:
+# cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja && ninja
+
 cmake_minimum_required(VERSION 2.8)
 project(IcuCodeGeneration)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(USE_LEGACY_LIBICU OFF CACHE BOOL "Use icu icu4c-58_2, latest version not requiring a C++11 compiler (for LSB and old versions of Visual Studio)")
+
+if (NOT USE_LEGACY_LIBICU)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
 
 include(${CMAKE_SOURCE_DIR}/../../CMake/Compiler.cmake)
 include(${CMAKE_SOURCE_DIR}/../../CMake/DownloadPackage.cmake)
@@ -20,14 +30,24 @@
 aux_source_directory(${LIBICU_SOURCES_DIR}/source/i18n           LIBICU_SOURCES)
 aux_source_directory(${LIBICU_SOURCES_DIR}/source/tools/toolutil LIBICU_SOURCES)
 
-set_source_files_properties(
-  ${LIBICU_SOURCES_DIR}/source/tools/genccode/genccode.c
-  PROPERTIES COMPILE_DEFINITIONS "char16_t=uint16_t"
-  )
+if (USE_LEGACY_LIBICU)
+  list(APPEND LIBICU_SOURCES
+    ${LIBICU_SOURCES_DIR}/source/stubdata/stubdata.c
+    )
+else()
+  list(APPEND LIBICU_SOURCES
+    ${LIBICU_SOURCES_DIR}/source/stubdata/stubdata.cpp
+    )
+  set_source_files_properties(
+    ${LIBICU_SOURCES_DIR}/source/tools/genccode/genccode.c
+    PROPERTIES COMPILE_DEFINITIONS "char16_t=uint16_t"
+    )
+endif()
+
+
 
 add_executable(IcuCodeGeneration
   ${LIBICU_SOURCES_DIR}/source/tools/genccode/genccode.c
-  ${LIBICU_SOURCES_DIR}/source/stubdata/stubdata.cpp
   ${LIBICU_SOURCES}
   )