extract one-edge-loops from wire before passing it to MakeLoops algo

remarks # 1
get rid of std::max
2025-08-14 13:30:48 +03:00 · 2015-08-12 11:02:57 +03:00 · 2015-08-11 17:27:38 +03:00 · 2015-08-11 17:27:36 +03:00 · 2015-08-11 17:27:35 +03:00 · 2015-08-11 17:27:33 +03:00
19799 changed files with 732230 additions and 611379 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@ Release
 /adm/lin
 /adm/mac
 /adm/make
-/adm/cmake
 *.vcproj*user
 *.csproj*user
 *.ncb
@@ -44,12 +43,12 @@ Release
 # Emacs backup files
 *~

-#Generated files
+# Generated files
 /*.am
 /*.m4
 /*.ac
 /*.sh
-/*.bat
+/custom.bat
 /autom4te.cache
 /build_configure
 /configure
@@ -58,3 +57,5 @@ Release
 /Makefile
 /libtool
 /stamp*
+/build
+/install
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,20 @@
-cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR)
+cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)

 set (CMAKE_SUPPRESS_REGENERATION TRUE)

-# set build configurations list
-if (NOT BUILD_CONFIGURATION)
-  set (BUILD_CONFIGURATION "Release" CACHE STRING "Build type of OCCT" FORCE)
-  SET_PROPERTY(CACHE BUILD_CONFIGURATION PROPERTY STRINGS Release Debug RelWithDebInfo)
+set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
+
+# set type of OCCT libraries
+if (NOT BUILD_LIBRARY_TYPE)
+  set (BUILD_LIBRARY_TYPE "Shared" CACHE STRING "The type of OCCT libraries" FORCE)
+  SET_PROPERTY(CACHE BUILD_LIBRARY_TYPE PROPERTY STRINGS Shared Static)
 endif()

-set (CMAKE_CONFIGURATION_TYPES ${BUILD_CONFIGURATION} CACHE INTERNAL "" FORCE)
+if ("${BUILD_LIBRARY_TYPE}" STREQUAL "Shared")
+  set (BUILD_SHARED_LIBS ON)
+else()
+  unset (BUILD_SHARED_LIBS)
+endif()

 # the name of the project
 project (OCCT)
@@ -16,16 +22,33 @@ project (OCCT)
 # Solution folder property
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)

-set (CMAKE_BUILD_TYPE ${BUILD_CONFIGURATION} CACHE INTERNAL "Build type of OCCT" FORCE )
+# Tests
+set (TESTS_RUN OFF CACHE BOOL "Run tests or not")
+set (TESTS_INSTALL OFF CACHE BOOL "Copy tests to folder install")
+set (TESTS_SHAPES_DIR "" CACHE PATH "Directory that will contain shapes for tests" )
+
+# Find Bison and Flex executables to rebuild *.yacc and *.lex files if it is necessary (BUILD_BISON_FLEX_FILES is ON)
+set (BUILD_BISON_FLEX_FILES OFF CACHE BOOL "Build *.yacc/*.lex files")
+if (${BUILD_BISON_FLEX_FILES})
+  foreach (aTool BISON FLEX)
+    list (APPEND CMAKE_PROGRAM_PATH ${BUILD_BISON_FLEX_DIR})
+    find_package (${aTool})
+    if (NOT ${${aTool}_FOUND})
+      message ("Warning : set BUILD_BISON_FLEX_DIR directory")
+      set (BUILD_BISON_FLEX_DIR "" CACHE PATH "Filepath to BISON and FLEX executables")
+      set (BUILD_BISON_FLEX_FILES OFF)
+    endif()
+  endforeach()
+endif()
+
+# copy samples to install directory
+set (INSTALL_SAMPLES OFF CACHE BOOL "Copy OCCT samples to install directory")

 # install dir of the built project
 set (INSTALL_DIR "" CACHE PATH "Directory that will contain install files of OCCT" )
 set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )

-# whether install test bundle or not
-set (INSTALL_TESTS OFF CACHE BOOL "Is tests copy to install directory")
-
-set (BUILD_PATCH_DIR "" CACHE PATH "directory with OCCT patch")
+set (BUILD_PATCH_DIR "" CACHE PATH "directory with occt patch")

 # the list of being built toolkits
 set (BUILD_TOOLKITS "" CACHE STRING "Toolkits are also included in OCCT")
@@ -46,34 +69,68 @@ set (USE_VTK OFF CACHE BOOL "Is VTK used or not")
 if (NOT DEFINED ANDROID)
  set (USE_GL2PS OFF CACHE BOOL "Is gl2ps used or not")
  set (USE_TBB OFF CACHE BOOL "Is tbb used or not")
-  set (USE_OPENCL OFF CACHE BOOL "Is OpenCL used or not")
+  #set (USE_OPENCL OFF CACHE BOOL "Is OpenCL used or not")
 endif()

 # macro: include patched file if it exists
 macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
  if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
-    include(${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
+    include (${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
  else()
-    include(${BEING_INCLUDED_FILE}.cmake)
+    include (${BEING_INCLUDED_FILE}.cmake)
  endif()
 endmacro()

 # include occt macros
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
-
-# BUILD_POSTFIX variable is used by all toolkit cmakelists.txt projects
-OCCT_MAKE_BUILD_POSTFIX()
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")

 # include the patched or original list of modules
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_modules")
+# list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
+# list <OCCT_MODULES> will contain all modules
+OCCT_MODULES_AND_TOOLKITS (OCCT_MODULES)

-# include the list of being used toolkits. USED_TOOLKITS variable
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_toolkits")
+foreach (MODULE ${OCCT_MODULES})
+  set (BUILD_${MODULE} ON CACHE BOOL "include ${MODULE}")
+endforeach()
+
+# Overview
+set (BUILD_OCCT_OVERVIEW OFF CACHE BOOL "Build OCCT overview in HTML format")
+
+if (NOT USE_VTK)
+  list (REMOVE_ITEM Visualization_TOOLKITS TKIVtk)
+  list (REMOVE_ITEM Draw_TOOLKITS TKIVtkDraw)
+endif()
+
+# accumulate used toolkits (first level) in USED_TOOLKITS variable
+list (APPEND USED_TOOLKITS ${BUILD_TOOLKITS})
+
+foreach (MODULE ${OCCT_MODULES})
+  if (BUILD_${MODULE})
+    list (APPEND USED_TOOLKITS ${${MODULE}_TOOLKITS})
+  endif()
+endforeach()
+
+# DRAWEXE excluded when library build is static
+if (NOT BUILD_SHARED_LIBS)
+  list (REMOVE_ITEM USED_TOOLKITS DRAWEXE)
+  message (STATUS "Info: DRAWEXE is not included due to ${BUILD_LIBRARY_TYPE} build library type")
+endif()
+
+# accumulate all used toolkits
+list (REMOVE_DUPLICATES USED_TOOLKITS)
+set (RAW_USED_TOOLKIT)
+foreach(USED_TOOLKIT ${USED_TOOLKITS})
+  OCCT_TOOLKIT_FULL_DEP (${USED_TOOLKIT} TOOLKIT_FULL_DEPS)
+  list (APPEND RAW_USED_TOOLKIT ${USED_TOOLKIT} ${TOOLKIT_FULL_DEPS})
+endforeach()
+
+list (REMOVE_DUPLICATES RAW_USED_TOOLKIT)
+set (USED_TOOLKITS ${RAW_USED_TOOLKIT})

 # include the patched or original list of definitions and flags
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_defs_flags")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags")

-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/3rdparty_macro")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro")

 set (3RDPARTY_DIR_LABEL "The directory containing required 3rdparty products")
 if (NOT DEFINED 3RDPARTY_DIR)
@@ -96,7 +153,7 @@ OCCT_IS_PRODUCT_REQUIRED(CSF_TclLibs USE_TCL)

 if ("${USE_TCL}" STREQUAL ON)
  message (STATUS "Info: tcl is used by OCCT")
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tcl")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tcl")
 else()
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TCL")
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TK")
@@ -107,7 +164,7 @@ OCCT_IS_PRODUCT_REQUIRED(CSF_FREETYPE USE_FREETYPE)

 if ("${USE_FREETYPE}" STREQUAL ON)
  message (STATUS "Info: freetype is used by OCCT")
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freetype")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
 else()
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
  OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")
@@ -117,20 +174,20 @@ endif()
 # VTK
 if (USE_VTK)
  add_definitions (-DHAVE_VTK)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/vtk")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
 endif()

 # GLX
 if (USE_GLX)
  add_definitions (-DMACOSX_USE_GLX)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/glx")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/glx")
 endif()

 # FREEIMAGE
 if (USE_FREEIMAGE)
  add_definitions (-DHAVE_FREEIMAGE)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimage")
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimageplus")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimage")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimageplus")
 else()
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE")
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGEPLUS")
@@ -141,33 +198,52 @@ endif()
 # GL2PS
 if (USE_GL2PS)
  add_definitions (-DHAVE_GL2PS)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/gl2ps")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gl2ps")
 else()
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
  OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
 endif()

 # OPENCL
-if (USE_OPENCL)
-  add_definitions (-DHAVE_OPENCL)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/opencl")
-else()
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
-  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER")
-  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
-  OCCT_CHECK_AND_UNSET ("INSTALL_OPENCL")
-endif()
+#if (USE_OPENCL)
+#  add_definitions (-DHAVE_OPENCL)
+#  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/opencl")
+#else()
+#  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
+#  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER")
+#  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
+#  OCCT_CHECK_AND_UNSET ("INSTALL_OPENCL")
+#endif()

 # TBB
 if (USE_TBB)
  add_definitions (-DHAVE_TBB)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tbb")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb")
 else()
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
  OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
 endif()

+# Doxygen
+if (BUILD_OCCT_OVERVIEW)
+  if (NOT DEFINED INSTALL_OCCT_OVERVIEW)
+    set (INSTALL_OCCT_OVERVIEW OFF CACHE BOOL "Copy OCCT overview into install directory")
+  endif()
+
+  if (INSTALL_OCCT_OVERVIEW)
+    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_DIR}/doc")
+    install (FILES "${CMAKE_SOURCE_DIR}/dox/resources/overview.html" DESTINATION  "${INSTALL_DIR}")
+  endif()
+
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/doxygen")
+else()
+  OCCT_CHECK_AND_UNSET ("INSTALL_OCCT_OVERVIEW")
+
+  OCCT_CHECK_AND_UNSET ("3RDPARTY_DOXYGEN_EXECUTABLE")
+  OCCT_CHECK_AND_UNSET ("3RDPARTY_DOXYGEN_DOT_EXECUTABLE")
+endif()
+
 string (REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")

 # check all 3rdparty paths
@@ -182,6 +258,9 @@ if (3RDPARTY_INCLUDE_DIRS)
  include_directories (${3RDPARTY_INCLUDE_DIRS})
 endif()

+# include <cmake binary folder>/inc
+include_directories (${CMAKE_BINARY_DIR}/inc)
+
 if (3RDPARTY_LIBRARY_DIRS)
  list (REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
  string (REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
@@ -189,142 +268,167 @@ if (3RDPARTY_LIBRARY_DIRS)
  link_directories (${3RDPARTY_LIBRARY_DIRS})
 endif()

-OCCT_MAKE_BUILD_POSTFIX()
+# Get all used variables: OS_WITH_BIT, COMPILER
+OCCT_MAKE_OS_WITH_BITNESS()
+OCCT_MAKE_COMPILER_SHORT_NAME()

 # build directories
-set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib${BUILD_POSTFIX})
-set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib${BUILD_POSTFIX})
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/bin${BUILD_POSTFIX})
+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+
+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+
+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+
+if (WIN32) 
+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG   "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+endif()

 if ("${INSTALL_DIR}" STREQUAL "")
-  message (FATAL_ERROR "INSTALL_DIR variable is empty. It's required to define installation directory")
-else()
-  # inc,data,tests DIRECTORY
-  install (DIRECTORY "${CMAKE_SOURCE_DIR}/inc"          DESTINATION  "${INSTALL_DIR}")
-  install (DIRECTORY "${CMAKE_SOURCE_DIR}/data"         DESTINATION  "${INSTALL_DIR}")
-  install (DIRECTORY "${CMAKE_SOURCE_DIR}/samples/tcl"  DESTINATION  "${INSTALL_DIR}/samples")
-  if (INSTALL_TESTS)
-    install (DIRECTORY "${CMAKE_SOURCE_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
-  endif()
+  get_filename_component (CMAKE_BINARY_DIR_PARENT ${CMAKE_BINARY_DIR} DIRECTORY)

-  # install patch inc, data, tests folder
-  if (NOT "${BUILD_PATCH_DIR}" STREQUAL "")
-    if (EXISTS "${BUILD_PATCH_DIR}/inc")
-      install (DIRECTORY "${BUILD_PATCH_DIR}/inc" DESTINATION  "${INSTALL_DIR}" )
-    endif()
+  set (INSTALL_DIR "${CMAKE_BINARY_DIR_PARENT}/install" CACHE PATH "Directory that will contain install files of OCCT" FORCE)
+  set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )

-    if (EXISTS "${BUILD_PATCH_DIR}/data")
-      install (DIRECTORY "${BUILD_PATCH_DIR}/data"  DESTINATION  "${INSTALL_DIR}" )
-    endif()
-
-    if (INSTALL_TESTS)
-      if (EXISTS "${BUILD_PATCH_DIR}/tests")
-        install (DIRECTORY "${BUILD_PATCH_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
-      endif()
-    endif()
-  endif()
-
-  if (WIN32)
-    set (SCRIPT_EXT bat)
-  else()
-    set (SCRIPT_EXT sh)
-  endif()
-
-  # DRAW.BAT or DRAW.SH
-  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
-    install(FILES "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
-            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-  ELSE()
-    install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
-            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-  ENDIF()
-
-  # set compiler short name
-  OCCT_MAKE_COMPILER_SHORT_NAME()
-
-  OCCT_MAKE_COMPILER_BITNESS()
-
-  SET(SUB_CUSTOM "custom_${COMPILER}_${COMPILER_BITNESS}_${BUILD_POSTFIX}.${SCRIPT_EXT}")
-
-  if (WIN32)
-    SET (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM}\" (\n  call \"%~dp0${SUB_CUSTOM}\" %1 %2 %3 \n)")
-  else()
-    SET (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
-  endif()
-
-  # change custom.bat/sh
-  if (EXISTS "${INSTALL_DIR}/custom.${SCRIPT_EXT}")
-    file (READ "${INSTALL_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
-
-    set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-
-    file (WRITE "${INSTALL_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
-  else()
-    OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "${INSTALL_DIR}")
-  endif()
-
-  # write current custom.bat/sh
-  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.in" "${SUB_CUSTOM}" "${INSTALL_DIR}")
-
-  if (BUILD_MFC_SAMPLES)
-    OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}")
-  endif()
-
-  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}" "${INSTALL_DIR}")
+  message (STATUS "Info: INSTALL_DIR has been set as ${INSTALL_DIR}")
 endif()

+message (STATUS "\nInfo: Collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")
+
+# (!) patch is not taken into account COLLECT_AND_INSTALL_OCCT_HEADER_FILES
+# collect all the headers to <binary dir>/inc folder
+COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${CMAKE_BINARY_DIR}" "${USED_TOOLKITS}")
+# apply patched header files
+#if (NOT "${BUILD_PATCH_DIR}" STREQUAL "")
+#  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${BUILD_PATCH_DIR}" "${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${CMAKE_BINARY_DIR}")
+#endif()
+
+OCCT_INSTALL_FILE_OR_DIR ("data" "${INSTALL_DIR}")
+OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR}/samples")
+
+if (INSTALL_SAMPLES)
+  OCCT_INSTALL_FILE_OR_DIR ("samples" "${INSTALL_DIR}")
+endif()
+
+if (TESTS_INSTALL)
+  OCCT_INSTALL_FILE_OR_DIR ("tests" "${INSTALL_DIR}")
+endif()
+
+if (WIN32)
+  set (SCRIPT_EXT bat)
+else()
+  set (SCRIPT_EXT sh)
+endif()
+
+# Creation of "START_TESTS" project
+if (TESTS_RUN AND TESTS_INSTALL)
+  #set(BUILD_TESTING ON)
+  #enable_testing ()
+  #add_test(NAME RUN_TESTS COMMAND ${INSTALL_DIR}/draw.${SCRIPT_EXT} -c testgrid -overwrite -outdir ${INSTALL_DIR}/TestResults)
+  add_custom_target(START_TESTS ${INSTALL_DIR}/draw.${SCRIPT_EXT} -c testgrid -overwrite -outdir ${INSTALL_DIR}/TestResults DEPENDS INSTALL)
+endif()
+
+# DRAW.BAT or DRAW.SH
+if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
+  install (FILES "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
+          OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+else()
+  install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
+          OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+endif()
+OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
+
+set (SUB_CUSTOM "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}")
+
+if (WIN32)
+  set (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM}\" (\n  call \"%~dp0${SUB_CUSTOM}\" %VCVER% %ARCH% %CASDEB% \n)")
+else()
+  set (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
+endif()
+
+ # change custom.bat/sh
+if (EXISTS "${INSTALL_DIR}/custom.${SCRIPT_EXT}")
+  file (READ "${INSTALL_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
+
+  set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
+
+  file (WRITE "${INSTALL_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+else()
+  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "${INSTALL_DIR}")
+endif()
+
+# write current custom.bat/sh
+OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.in" "${SUB_CUSTOM}" "${INSTALL_DIR}")
+
+if (BUILD_MFC_SAMPLES)
+  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}")
+  OCCT_COPY_FILE_OR_DIR ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
+endif()
+
+OCCT_CONFIGURE ("adm/templates/env.build.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
+OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.install.${SCRIPT_EXT}")
+install (FILES "${CMAKE_BINARY_DIR}/env.install.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" RENAME "env.${SCRIPT_EXT}")
+
 # RESOURCES
-OCCT_INSTALL_FILE_OR_DIR ("src/DrawResources"          "${INSTALL_DIR}/src")
-OCCT_INSTALL_FILE_OR_DIR ("src/StdResource"            "${INSTALL_DIR}/src")
-OCCT_INSTALL_FILE_OR_DIR ("src/SHMessage"              "${INSTALL_DIR}/src")
-OCCT_INSTALL_FILE_OR_DIR ("src/Textures"               "${INSTALL_DIR}/src")
-OCCT_INSTALL_FILE_OR_DIR ("src/Shaders"                "${INSTALL_DIR}/src")
-OCCT_INSTALL_FILE_OR_DIR ("src/XSMessage"              "${INSTALL_DIR}/src")
-OCCT_INSTALL_FILE_OR_DIR ("src/XSTEPResource"          "${INSTALL_DIR}/src")
-OCCT_INSTALL_FILE_OR_DIR ("src/XmlOcafResource"        "${INSTALL_DIR}/src")
-
-OCCT_INSTALL_FILE_OR_DIR ("src/UnitsAPI/Lexi_Expr.dat" "${INSTALL_DIR}/src/UnitsAPI")
-OCCT_INSTALL_FILE_OR_DIR ("src/UnitsAPI/Units.dat"     "${INSTALL_DIR}/src/UnitsAPI")
-OCCT_INSTALL_FILE_OR_DIR ("src/TObj/TObj.msg"          "${INSTALL_DIR}/src/TObj")
-
-
-#Toolkits uses variables: INSTALL_DIR, OS_WITH_BIT, COMPILER, BUILD_POSTFIX
-OCCT_MAKE_OS_WITH_BITNESS()
-
-# consider for patch existence
-set (IS_PATCH_CURRENT "NO")
-set (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
-if (NOT "${BUILD_PATCH_DIR}" STREQUAL "")
-  set (IS_PATCH_CURRENT "YES")
-  set (TK_ROOT_DIR ${BUILD_PATCH_DIR})
-endif()
+FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
+foreach(RESOURCE ${RESOURCES})
+  get_filename_component(RESOURCE_FOLDER ${RESOURCE} DIRECTORY)
+  if(NOT "${RESOURCE_FOLDER}" STREQUAL "")
+    get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME)
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/src/${RESOURCE_FOLDER}")
+  else()
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/src")
+  endif()
+endforeach()

 # include patched toolkit projects or original ones
-set (UNSUBDIRS "")
-if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/cmake/occt_inc_toolkits.cmake")
-  set (TK_ROOT_DIR ${BUILD_PATCH_DIR})
-  include (${BUILD_PATCH_DIR}/adm/cmake/occt_inc_toolkits.cmake)
-else()
-  set (IS_PATCH_CURRENT "NO")
-  set (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
-  include (adm/cmake/occt_inc_toolkits.cmake)
+foreach (USED_TOOLKIT ${USED_TOOLKITS})
+  if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}")
+    add_subdirectory(${BUILD_PATCH_DIR}/src/${USED_TOOLKIT})
+  elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}")
+    add_subdirectory (${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT})
+  else()
+    message (STATUS "${USED_TOOLKIT} is not included")
+  endif()
+endforeach()
+
+if (BUILD_OCCT_OVERVIEW)
+  add_subdirectory (dox)
 endif()

-# include some required original occt_inc_toolkits
-if (NOT "${UNSUBDIRS}" STREQUAL "")
-  set (IS_PATCH_CURRENT "NO")
-  # add required subdirs
-  foreach (UNSUBDIR ${UNSUBDIRS})
-    add_subdirectory (${CMAKE_SOURCE_DIR}/${UNSUBDIR})
-  endforeach()
+# patch DRAWEXE
+if (MSVC AND 3RDPARTY_DLL_DIRS)
+  list (FIND USED_TOOLKITS DRAWEXE DRAWEXE_INDEX)
+  if (${DRAWEXE_INDEX} GREATER -1)
+    list (REMOVE_DUPLICATES 3RDPARTY_DLL_DIRS)
+    set (3RDPARTY_DLL_DIRS_FOR_PATH "")
+
+    foreach (3RDPARTY_DLL_DIR ${3RDPARTY_DLL_DIRS})
+      set (3RDPARTY_DLL_DIRS_FOR_PATH "${3RDPARTY_DLL_DIRS_FOR_PATH};${3RDPARTY_DLL_DIR}")
+    endforeach()
+
+    OCCT_MAKE_COMPILER_BITNESS()
+    set (X_COMPILER_BITNESS "x64")
+    if ("${COMPILER_BITNESS}" STREQUAL "32")
+      set (X_COMPILER_BITNESS "Win32")
+    endif()
+
+    configure_file (${CMAKE_SOURCE_DIR}/adm/templates/DRAWEXE.vcxproj.user.in ${CMAKE_BINARY_DIR}/src/DRAWEXE/DRAWEXE.vcxproj.user @ONLY)
+  endif()
 endif()

 # samples do not support patch usage
-IF (BUILD_MFC_SAMPLES)
-  SET (OCCT_ROOT ${CMAKE_SOURCE_DIR})
+if (BUILD_MFC_SAMPLES)
+  set (OCCT_ROOT ${CMAKE_SOURCE_DIR})

-  SET (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
-  SET (COMMON_WINMAIN_FILE      ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)
+  set (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
+  set (COMMON_WINMAIN_FILE      ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)

  add_subdirectory(samples/mfc/standard/mfcsample)
  add_subdirectory(samples/mfc/standard/01_Geometry)
@@ -337,4 +441,4 @@ IF (BUILD_MFC_SAMPLES)
  add_subdirectory(samples/mfc/standard/08_HLR)
  add_subdirectory(samples/mfc/standard/09_Animation)
  add_subdirectory(samples/mfc/standard/10_Convert)
-ENDIF()
+endif()
--- a/adm/CMPLRS
+++ b/adm/CMPLRS
@@ -0,0 +1,18 @@
+wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
+lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
+
+wnt cmplrs_cxx f -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx b -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
+wnt cmplrs_cxx WNT (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
+
+wnt cmplrs_c f -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c b -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
+
+lin cmplrs_cxx f -DLIN -DLININTEL -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx b -DLIN -DLININTEL -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
+
+lin cmplrs_c f -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions
+lin cmplrs_c b -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions
+
--- a/adm/MODULES
+++ b/adm/MODULES
@@ -0,0 +1,7 @@
+FoundationClasses TKernel TKMath
+ModelingData TKG2d TKG3d TKGeomBase TKBRep
+ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
+Visualization TKService TKV3d TKOpenGl TKMeshVS TKVoxel TKIVtk
+ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml FWOSPlugin TKTObj TKBinTObj TKXmlTObj
+DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF
+Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
--- a/adm/RESOURCES
+++ b/adm/RESOURCES
@@ -0,0 +1,11 @@
+DrawResources
+StdResource
+SHMessage
+Textures
+Shaders
+XSMessage
+XSTEPResource
+XmlOcafResource
+UnitsAPI/Lexi_Expr.dat
+UnitsAPI/Units.dat
+TObj/TObj.msg
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -1,187 +1,186 @@
 n NCollection
-p BSplCLib
-p BSplSLib
-p Bnd
-p BVH
-p CSLib
-p Convert
-p Dico
-p ElCLib
-p ElSLib
-p Expr
-p ExprIntrp
-p FSD
-p GeomAbs
-p MMgt
-p Message
-p OSD
-p PLib
-p Plugin
-p Poly
-p Precision
-p Quantity
-p Resource
-p SortTools
-p Standard
-p StdFail
-p Storage
-p TColStd
-p TColgp
-p TCollection
-p TShort
-p TopLoc
-p Units
-p UnitsAPI
-p gp
-p math
+n BSplCLib
+n BSplSLib
+n Bnd
+n BVH
+n CSLib
+n Convert
+n Dico
+n ElCLib
+n ElSLib
+n Expr
+n ExprIntrp
+n FSD
+n GeomAbs
+n MMgt
+n Message
+n OSD
+n PLib
+n Plugin
+n Poly
+n Precision
+n Quantity
+n Resource
+n Standard
+n StdFail
+n Storage
+n TColStd
+n TColgp
+n TCollection
+n TShort
+n TopLoc
+n Units
+n UnitsAPI
+n gp
+n math
 r OS
 t TKMath
 t TKernel
-p Adaptor2d
-p Adaptor3d
-p AdvApp2Var
-p AdvApprox
-p AppCont
-p AppDef
-p AppParCurves
-p Approx
-p BRep
-p BRepAdaptor
-p BRepLProp
-p BRepTools
-p BndLib
-p CPnts
-p Extrema
-p FEmTool
-p GC
-p GCE2d
-p GCPnts
-p GProp
-p Geom
-p Geom2d
-p Geom2dAdaptor
-p Geom2dConvert
-p Geom2dLProp
-p GeomAdaptor
-p GeomConvert
-p GeomLProp
-p GeomLib
-p GeomProjLib
-p GeomTools
-p Hermit
-p IntAna
-p IntAna2d
-p LProp
-p LProp3d
-p ProjLib
-p TColGeom
-p TColGeom2d
-p TopAbs
-p TopExp
-p TopTools
-p TopoDS
-p gce
+n Adaptor2d
+n Adaptor3d
+n AdvApp2Var
+n AdvApprox
+n AppCont
+n AppDef
+n AppParCurves
+n Approx
+n BRep
+n BRepAdaptor
+n BRepLProp
+n BRepTools
+n BndLib
+n CPnts
+n Extrema
+n FEmTool
+n GC
+n GCE2d
+n GCPnts
+n GProp
+n Geom
+n Geom2d
+n Geom2dAdaptor
+n Geom2dConvert
+n Geom2dLProp
+n GeomAdaptor
+n GeomConvert
+n GeomLProp
+n GeomLib
+n GeomProjLib
+n GeomTools
+n Hermit
+n IntAna
+n IntAna2d
+n LProp
+n LProp3d
+n ProjLib
+n TColGeom
+n TColGeom2d
+n TopAbs
+n TopExp
+n TopTools
+n TopoDS
+n gce
 t TKBRep
 t TKG2d
 t TKG3d
 t TKGeomBase
-p AppBlend
-p ApproxInt
-p BOPTools
-p BRepAlgo
-p BRepAlgoAPI
-p BRepApprox
-p BRepBlend
-p BRepBndLib
-p BRepBuilderAPI
-p BRepCheck
-p BRepClass
-p BRepClass3d
-p BRepExtrema
-p BRepFeat
-p BRepFill
-p BRepFilletAPI
-p BRepGProp
-p BRepIntCurveSurface
-p BRepLib
-p BRepMAT2d
+n AppBlend
+n ApproxInt
+n BOPTools
+n BRepAlgo
+n BRepAlgoAPI
+n BRepApprox
+n BRepBlend
+n BRepBndLib
+n BRepBuilderAPI
+n BRepCheck
+n BRepClass
+n BRepClass3d
+n BRepExtrema
+n BRepFeat
+n BRepFill
+n BRepFilletAPI
+n BRepGProp
+n BRepIntCurveSurface
+n BRepLib
+n BRepMAT2d
 n BRepMesh
-p BRepOffset
-p BRepOffsetAPI
-p BRepPrim
-p BRepPrimAPI
-p BRepProj
-p BRepSweep
-p BRepTopAdaptor
-p BiTgte
-p Bisector
-p Blend
-p BlendFunc
-p ChFi2d
-p ChFi3d
-p ChFiDS
-p ChFiKPart
-p Contap
-p Draft
-p FairCurve
-p FilletSurf
-p GccAna
-p GccEnt
-p GccInt
-p Geom2dAPI
-p Geom2dGcc
-p Geom2dHatch
-p Geom2dInt
-p GeomAPI
-p GeomFill
-p GeomInt
-p GeomPlate
-p HLRAlgo
-p HLRBRep
-p HLRTopoBRep
-p HLRAppli
-p Hatch
-p HatchGen
-p IntCurve
-p IntCurveSurface
-p IntCurvesFace
-p IntImp
-p IntImpParGen
-p IntPatch
-p IntPolyh
-p IntRes2d
-p IntStart
-p IntSurf
-p IntTools
-p IntWalk
-p Intf
-p Intrv
-p Law
-p LocOpe
-p LocalAnalysis
-p MAT
-p MAT2d
-p NLPlate
-p Plate
-p ShapeAlgo
-p ShapeAnalysis
-p ShapeBuild
-p ShapeConstruct
-p ShapeCustom
-p ShapeExtend
-p ShapeFix
-p ShapeProcess
-p ShapeProcessAPI
-p ShapeUpgrade
-p Sweep
-p TopBas
-p TopClass
-p TopCnx
-p TopOpeBRep
-p TopOpeBRepBuild
-p TopOpeBRepDS
-p TopOpeBRepTool
-p TopTrans
+n BRepOffset
+n BRepOffsetAPI
+n BRepPrim
+n BRepPrimAPI
+n BRepProj
+n BRepSweep
+n BRepTopAdaptor
+n BiTgte
+n Bisector
+n Blend
+n BlendFunc
+n ChFi2d
+n ChFi3d
+n ChFiDS
+n ChFiKPart
+n Contap
+n Draft
+n FairCurve
+n FilletSurf
+n GccAna
+n GccEnt
+n GccInt
+n Geom2dAPI
+n Geom2dGcc
+n Geom2dHatch
+n Geom2dInt
+n GeomAPI
+n GeomFill
+n GeomInt
+n GeomPlate
+n HLRAlgo
+n HLRBRep
+n HLRTopoBRep
+n HLRAppli
+n Hatch
+n HatchGen
+n IntCurve
+n IntCurveSurface
+n IntCurvesFace
+n IntImp
+n IntImpParGen
+n IntPatch
+n IntPolyh
+n IntRes2d
+n IntStart
+n IntSurf
+n IntTools
+n IntWalk
+n Intf
+n Intrv
+n Law
+n LocOpe
+n LocalAnalysis
+n MAT
+n MAT2d
+n NLPlate
+n Plate
+n ShapeAlgo
+n ShapeAnalysis
+n ShapeBuild
+n ShapeConstruct
+n ShapeCustom
+n ShapeExtend
+n ShapeFix
+n ShapeProcess
+n ShapeProcessAPI
+n ShapeUpgrade
+n Sweep
+n TopBas
+n TopClass
+n TopCnx
+n TopOpeBRep
+n TopOpeBRepBuild
+n TopOpeBRepDS
+n TopOpeBRepTool
+n TopTrans
 n XBRepMesh
 t TKBO
 t TKBool
@@ -196,33 +195,33 @@ t TKShHealing
 t TKTopAlgo
 t TKXMesh
 n InterfaceGraphic
-p AIS
-p Aspect
-p DsgPrs
-p Graphic3d
-p Image
-p MeshVS
-p NIS
-p OpenGl
-p Prs3d
-p PrsMgr
-p Select3D
-p SelectBasics
-p SelectMgr
-p StdPrs
-p StdSelect
-p TColQuantity
-p V3d
-p Visual3d
-p Voxel
-p WNT
-p Xw
-p Cocoa
+n AIS
+n Aspect
+n DsgPrs
+n Graphic3d
+n Image
+n MeshVS
+n OpenGl
+n D3DHost
+n Prs3d
+n PrsMgr
+n Select3D
+n SelectBasics
+n SelectMgr
+n StdPrs
+n StdSelect
+n TColQuantity
+n V3d
+n Visual3d
+n Voxel
+n WNT
+n Xw
+n Cocoa
 r Textures
 r Shaders
 t TKMeshVS
-t TKNIS
 t TKOpenGl
+t TKD3DHost
 t TKService
 t TKV3d
 t TKVoxel
@@ -230,189 +229,139 @@ n BinTObjDrivers
 n LDOM
 n TObj
 n XmlTObjDrivers
-p AppStd
-p AppStdL
-p BinDrivers
-p BinLDrivers
-p BinMDF
-p BinMDataStd
-p BinMDataXtd
-p BinMDocStd
-p BinMFunction
-p BinMNaming
-p BinMPrsStd
-p BinObjMgt
-p BinTools
-p CDF
-p CDM
-p DBC
-p FWOSDriver
-p MDF
-p MDataStd
-p MDataXtd
-p MDocStd
-p MFunction
-p MNaming
-p MPrsStd
-p MgtBRep
-p MgtGeom
-p MgtGeom2d
-p MgtPoly
-p MgtTopLoc
-p MgtTopoDS
-p ObjMgt
-p PBRep
-p PCDM
-p PCDMShape
-p PColStd
-p PColgp
-p PCollection
-p PDF
-p PDataStd
-p PDataXtd
-p PDocStd
-p PFunction
-p PGeom
-p PGeom2d
-p PMMgt
-p PNaming
-p PPoly
-p PPrsStd
-p PShort
-p PStandard
-p PTColStd
-p PTopLoc
-p PTopoDS
-p StdDrivers
-p StdLDrivers
-p TDF
-p TDataStd
-p TDataXtd
-p TDocStd
-p TFunction
-p TNaming
-p TPrsStd
-p UTL
-p XmlDrivers
-p XmlLDrivers
-p XmlMDF
-p XmlMDataStd
-p XmlMDataXtd
-p XmlMDocStd
-p XmlMFunction
-p XmlMNaming
-p XmlMPrsStd
-p XmlObjMgt
+n AppStd
+n AppStdL
+n BinDrivers
+n BinLDrivers
+n BinMDF
+n BinMDataStd
+n BinMDataXtd
+n BinMDocStd
+n BinMFunction
+n BinMNaming
+n BinMPrsStd
+n BinObjMgt
+n BinTools
+n CDF
+n CDM
+n FWOSDriver
+n PCDM
+n TDF
+n TDataStd
+n TDataXtd
+n TDocStd
+n TFunction
+n TNaming
+n TPrsStd
+n UTL
+n XmlDrivers
+n XmlLDrivers
+n XmlMDF
+n XmlMDataStd
+n XmlMDataXtd
+n XmlMDocStd
+n XmlMFunction
+n XmlMNaming
+n XmlMPrsStd
+n XmlObjMgt
 r StdResource
 r XmlOcafResource
-s ShapeSchema
-s StdLSchema
-s StdSchema
 t FWOSPlugin
-t PTKernel
+
 t TKBin
 t TKBinL
 t TKBinTObj
 t TKCAF
 t TKCDF
 t TKLCAF
-t TKPCAF
-t TKPLCAF
-t TKPShape
-t TKShapeSchema
-t TKStdLSchema
-t TKStdSchema
+
 t TKTObj
 t TKXml
 t TKXmlL
 t TKXmlTObj
 n IGESFile
 n StepFile
-p APIHeaderSection
-p BRepToIGES
-p BRepToIGESBRep
-p BinMXCAFDoc
-p BinXCAFDrivers
-p Geom2dToIGES
-p GeomToIGES
-p GeomToStep
-p HeaderSection
-p IFGraph
-p IFSelect
-p IGESAppli
-p IGESBasic
-p IGESCAFControl
-p IGESControl
-p IGESConvGeom
-p IGESData
-p IGESDefs
-p IGESDimen
-p IGESDraw
-p IGESGeom
-p IGESGraph
-p IGESSelect
-p IGESSolid
-p IGESToBRep
-p Interface
-p LibCtl
-p MXCAFDoc
-p MoniTool
-p PXCAFDoc
-p RWHeaderSection
-p RWStepAP203
-p RWStepAP214
-p RWStepBasic
-p RWStepDimTol
-p RWStepElement
-p RWStepFEA
-p RWStepGeom
-p RWStepRepr
-p RWStepShape
-p RWStepVisual
-p RWStl
-p STEPCAFControl
-p STEPConstruct
-p STEPControl
-p STEPEdit
-p STEPSelections
-p StepAP203
-p StepAP209
-p StepAP214
-p StepBasic
-p StepData
-p StepDimTol
-p StepElement
-p StepFEA
-p StepGeom
-p StepRepr
-p StepSelect
-p StepShape
-p StepToGeom
-p StepToTopoDS
-p StepVisual
-p StlAPI
-p StlMesh
-p StlTransfer
-p TopoDSToStep
-p Transfer
-p TransferBRep
-p UnitsMethods
-p Vrml
-p VrmlAPI
-p VrmlConverter
-p VrmlData
-p XCAFApp
-p XCAFDoc
-p XCAFDrivers
-p XCAFPrs
-p XSAlgo
-p XSControl
-p XmlMXCAFDoc
-p XmlXCAFDrivers
+n APIHeaderSection
+n BRepToIGES
+n BRepToIGESBRep
+n BinMXCAFDoc
+n BinXCAFDrivers
+n Geom2dToIGES
+n GeomToIGES
+n GeomToStep
+n HeaderSection
+n IFGraph
+n IFSelect
+n IGESAppli
+n IGESBasic
+n IGESCAFControl
+n IGESControl
+n IGESConvGeom
+n IGESData
+n IGESDefs
+n IGESDimen
+n IGESDraw
+n IGESGeom
+n IGESGraph
+n IGESSelect
+n IGESSolid
+n IGESToBRep
+n Interface
+n LibCtl
+n MoniTool
+n RWHeaderSection
+n RWStepAP203
+n RWStepAP214
+n RWStepBasic
+n RWStepDimTol
+n RWStepElement
+n RWStepFEA
+n RWStepGeom
+n RWStepRepr
+n RWStepShape
+n RWStepVisual
+n RWStl
+n STEPCAFControl
+n STEPConstruct
+n STEPControl
+n STEPEdit
+n STEPSelections
+n StepAP203
+n StepAP209
+n StepAP214
+n StepBasic
+n StepData
+n StepDimTol
+n StepElement
+n StepFEA
+n StepGeom
+n StepRepr
+n StepSelect
+n StepShape
+n StepToGeom
+n StepToTopoDS
+n StepVisual
+n StlAPI
+n StlMesh
+n StlTransfer
+n TopoDSToStep
+n Transfer
+n TransferBRep
+n UnitsMethods
+n Vrml
+n VrmlAPI
+n VrmlConverter
+n VrmlData
+n XCAFApp
+n XCAFDoc
+n XCAFPrs
+n XSAlgo
+n XSControl
+n XmlMXCAFDoc
+n XmlXCAFDrivers
 r SHMessage
 r XSMessage
 r XSTEPResource
-s XCAFSchema
 t TKBinXCAF
 t TKIGES
 t TKSTEP
@@ -422,38 +371,37 @@ t TKSTEPBase
 t TKSTL
 t TKVRML
 t TKXCAF
-t TKXCAFSchema
 t TKXDEIGES
 t TKXDESTEP
 t TKXSBase
 t TKXmlXCAF
-p BOPTest
-p BRepTest
-p DBRep
-p DDF
-p DDataStd
-p DDocStd
-p DNaming
-p DPrsStd
-p Draw
-p DrawDim
-p DrawFairCurve
-p DrawTrSurf
-p GeometryTest
-p GeomliteTest
-p HLRTest
-p MeshTest
-p SWDRAW
-p TObjDRAW
-p TestTopOpe
-p TestTopOpeDraw
-p TestTopOpeTools
-p ViewerTest
-p XDEDRAW
-p XSDRAW
-p XSDRAWIGES
-p XSDRAWSTEP
-p XSDRAWSTLVRML
+n BOPTest
+n BRepTest
+n DBRep
+n DDF
+n DDataStd
+n DDocStd
+n DNaming
+n DPrsStd
+n Draw
+n DrawDim
+n DrawFairCurve
+n DrawTrSurf
+n GeometryTest
+n GeomliteTest
+n HLRTest
+n MeshTest
+n SWDRAW
+n TObjDRAW
+n TestTopOpe
+n TestTopOpeDraw
+n TestTopOpeTools
+n ViewerTest
+n XDEDRAW
+n XSDRAW
+n XSDRAWIGES
+n XSDRAWSTEP
+n XSDRAWSTLVRML
 r DrawResources
 t TKDCAF
 t TKDraw
@@ -463,22 +411,22 @@ t TKViewerTest
 t TKXDEDRAW
 t TKXSDRAW
 x DRAWEXE
-p QADraw
-p QANCollection
-p QANewBRepNaming
-p QANewDBRepNaming
-p QANewModTopOpe
+n QADraw
+n QANCollection
+n QANewBRepNaming
+n QANewDBRepNaming
+n QANewModTopOpe
 t TKQADraw
-p QADNaming
-p QABugs
-p Font
-p BOPAlgo
-p BOPDS
-p BOPCol
-p IVtk
-p IVtkOCC
-p IVtkVTK
-p IVtkTools
+n QADNaming
+n QABugs
+n Font
+n BOPAlgo
+n BOPDS
+n BOPCol
+n IVtk
+n IVtkOCC
+n IVtkVTK
+n IVtkTools
 t TKIVtk
-p IVtkDraw
-t TKIVtkDraw
+n IVtkDraw
+t TKIVtkDraw
--- a/adm/cmake/3rdparty_macro.cmake
+++ b/adm/cmake/3rdparty_macro.cmake
@@ -0,0 +1,189 @@
+#
+
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+
+macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEBUG)
+
+  # define 3RDPARTY_${PRODUCT_NAME}_DIR variable is it isn't defined
+  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
+    set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}")
+  endif()
+
+  # search for product directory inside 3RDPARTY_DIR directory
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR AND 3RDPARTY_DIR)
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" "${PRODUCT_NAME}" ${PRODUCT_NAME}_DIR_NAME)
+    if (${PRODUCT_NAME}_DIR_NAME)
+      message (STATUS "Info: ${PRODUCT_NAME}: ${${PRODUCT_NAME}_DIR_NAME} folder is used")
+      set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
+    endif()
+  endif()
+
+  if (NOT DEFINED INSTALL_${PRODUCT_NAME})
+    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "Is ${PRODUCT_NAME} required to be copied into install directory")
+  endif()
+
+  # search for include directory
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing the headers of the ${PRODUCT_NAME}" FORCE)
+    find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS
+                                                                    "${3RDPARTY_${PRODUCT_NAME}_DIR}/include"
+                                                                    ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_HEADER}
+                                                                   NO_DEFAULT_PATH)
+    find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME})
+  endif()
+
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing the headers of the ${PRODUCT_NAME}" FORCE)
+  endif()
+
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
+  elseif (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
+    get_filename_component(3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_TMP "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
+    if (NOT "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" STREQUAL "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_TMP}")
+      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
+    endif()
+  endif()
+
+  # search for library
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
+
+    find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME} PATHS
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}"
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_DIR}/lib"
+                                                                   ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_LIB}
+                                                                   NO_DEFAULT_PATH)
+    # second search if previous one do not find anything
+    find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME})
+  endif()
+
+  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} library" FORCE)
+  endif()
+
+  # library path
+  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
+    get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} library" FORCE)
+  endif()
+
+  # search for shared library (just for win case)
+  if (WIN32)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+
+    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
+      set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
+    elseif (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      get_filename_component(3RDPARTY_${PRODUCT_NAME}_DLL_DIR_TMP "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
+      if (NOT "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" STREQUAL "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_TMP}")
+        set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
+      endif()
+    endif()
+
+    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      set (3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
+
+      find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME}" PATHS
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}"
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_DIR}/bin"
+                                                                   ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_DLL}
+                                                                   NO_DEFAULT_PATH)
+
+        # second search if previous one do not find anything
+        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME}")
+    endif()
+
+    if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
+      set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
+    endif()
+
+    # shared library path
+    if (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
+      set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
+    endif()
+  endif()
+
+  if (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
+  endif()
+
+  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
+  endif()
+
+  if (WIN32)
+    if (3RDPARTY_${PRODUCT_NAME}_DLL OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
+    else()
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
+    endif()
+  endif()
+
+  set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
+
+  if (INSTALL_${PRODUCT_NAME})
+    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_COMPILER_SHORT_NAME()
+
+    if (WIN32)
+      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+               CONFIGURATIONS Release
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+
+    else()
+      get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} REALPATH)
+      if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
+        get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
+        install (FILES "${ABS_PATH}"
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                 RENAME ${FREEIMLIB}.3)
+                 install (FILES "${ABS_PATH}"
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                 RENAME ${FREEIMLIB}.3)
+        install (FILES "${ABS_PATH}"
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                 RENAME ${FREEIMLIB}.3)
+      endif()
+      if("${PRODUCT_NAME}" STREQUAL "GL2PS")
+        get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
+        install (FILES "${ABS_PATH}"
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                 RENAME ${GL2PSLIB}.1)
+        install (FILES "${ABS_PATH}"
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                 RENAME ${GL2PSLIB}.1)
+        install (FILES "${ABS_PATH}"
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                 RENAME ${GL2PSLIB}.1)
+      endif()
+    endif()
+  else()
+    # the library directory for using by the executable
+    if (WIN32)
+      set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
+    else()
+      set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
+    endif()
+  endif()
+
+  mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY 3RDPARTY_${PRODUCT_NAME}_DLL)
+endmacro()
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -0,0 +1,121 @@
+# Get all used packages from toolkit
+foreach (MODULE ${TOOLKIT_MODULES})
+  if (WIN32)
+    list (APPEND PRECOMPILED_DEFS "-D__${MODULE}_DLL")
+  endif()
+  list (APPEND COMPILER_DIRECTORIES "${OCCT_SOURCE_DIR}/src/${MODULE}")
+endforeach()
+string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
+
+# Get from toolkits EXTERNLIB all used libs
+OCCT_TOOLKIT_DEP (${PROJECT_NAME} ${PROJECT_NAME}_DEPS)
+foreach (DEP ${${PROJECT_NAME}_DEPS})
+  IS_OCCT_TOOLKIT (${DEP} OCCT_MODULES FOUND_TOOLKIT)
+  if ("${FOUND_TOOLKIT}" STREQUAL "ON")
+    list ( APPEND USED_LIBS "${DEP}" )
+  endif()
+endforeach()
+
+# Get all source files from used packages
+foreach (CDIR ${COMPILER_DIRECTORIES})
+  get_filename_component (CDirName ${CDIR} NAME)
+  set (CDIR_files)
+  set (HDIR_files)
+  file(STRINGS "${CDIR}/FILES" FLEX_Files REGEX ".+[.]lex")
+  file(STRINGS "${CDIR}/FILES" BISON_Files REGEX ".+[.]yacc")
+  file(STRINGS "${CDIR}/FILES" CFiles REGEX ".+[.]c")
+  file(STRINGS "${CDIR}/FILES" MFiles REGEX ".+[.]mm")
+  file(STRINGS "${CDIR}/FILES" HFiles REGEX ".+[.]h")
+  file(STRINGS "${CDIR}/FILES" LXXFiles REGEX ".+[.]lxx")
+  file(STRINGS "${CDIR}/FILES" GXXFiles REGEX ".+[.]gxx")
+
+  # Generate Flex and Bison files
+  if (${BUILD_BISON_FLEX_FILES})
+    list (LENGTH FLEX_Files FLength)
+    list (LENGTH BISON_Files BLength)
+    list (SORT FLEX_Files)
+    list (SORT BISON_Files)
+    if (${FLength} EQUAL ${BLength} AND NOT ${FLength} EQUAL 0)
+      math (EXPR FLength "${FLength} - 1")
+      foreach (FileIndex RANGE ${FLength})
+        list (GET FLEX_Files ${FileIndex} FLEX_File)
+        list (GET BISON_Files ${FileIndex} BISON_File)
+        get_filename_component (FLEX_Name ${FLEX_File} NAME_WE)
+        get_filename_component (BISON_Name ${BISON_File} NAME_WE)
+        string (COMPARE EQUAL ${FLEX_Name} ${BISON_Name} isEQUAL)
+        if (EXISTS "${FLEX_File}" AND EXISTS "${BISON_File}" AND ${isEQUAL})
+          BISON_TARGET (Parser_${BISON_Name} ${BISON_File} ${CDIR}/${BISON_Name}.tab.c)
+          FLEX_TARGET (Scanner_${FLEX_Name} ${FLEX_File} ${CDIR}/lex.${FLEX_Name}.c)
+          ADD_FLEX_BISON_DEPENDENCY (Scanner_${FLEX_Name} Parser_${BISON_Name})
+          list (APPEND CDIR_files ${BISON_Parser_${BISON_Name}_OUTPUTS} ${FLEX_Scanner_${FLEX_Name}_OUTPUTS})
+        endif()
+      endforeach()
+    endif()
+  endif()
+
+  list(APPEND HDIR_files ${HFiles} ${LXXFiles} ${GXXFiles})
+  list( APPEND CDIR_files ${CFiles})
+  if(APPLE)
+    list( APPEND CDIR_files ${MFiles})
+  endif()
+
+  foreach(HFile ${HDIR_files})
+    list( APPEND USED_INCFILES ${CDIR}/${HFile} )
+    SOURCE_GROUP ("Header Files\\${CDirName}" FILES ${CDIR}/${HFile})
+  endforeach(HFile)
+
+  foreach(CFile ${CDIR_files})
+    list( APPEND USED_SRCFILES ${CDIR}/${CFile} )
+    SOURCE_GROUP ("Source Files\\${CDirName}" FILES ${CDIR}/${CFile})
+  endforeach(CFile)
+endforeach(CDIR)
+
+list( FIND USED_TOOLKITS ${PROJECT_NAME} isFOUND)
+
+# Create project for toolkit
+if ("${USED_TOOLKITS}" STREQUAL "" OR NOT ${isFOUND} EQUAL -1)
+  foreach (MODULE ${OCCT_MODULES})
+    list (FIND ${MODULE}_TOOLKITS ${PROJECT_NAME} isFOUND)
+    if (NOT ${isFOUND} EQUAL -1)
+      set (CURRENT_MODULE ${MODULE})
+    endif()
+  endforeach()
+  if (isEXE)
+    add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+  else()
+    add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Release
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS RelWithDebInfo
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Debug
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+    if (MSVC)
+      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+    endif()
+  endif()
+
+  set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
+  target_link_libraries (${PROJECT_NAME} ${USED_LIBS})
+endif()
--- a/adm/cmake/doxygen.cmake
+++ b/adm/cmake/doxygen.cmake
@@ -0,0 +1,46 @@
+# doxygen
+
+if (NOT DEFINED 3RDPARTY_DOXYGEN_EXECUTABLE)
+  set (3RDPARTY_DOXYGEN_EXECUTABLE "" CACHE FILEPATH "The Path to the doxygen command")
+endif()
+
+if (NOT DEFINED 3RDPARTY_DOXYGEN_DOT_EXECUTABLE)
+  set (3RDPARTY_DOXYGEN_DOT_EXECUTABLE "" CACHE FILEPATH "The path to the dot program used by doxygen")
+endif()
+
+if (NOT DEFINED 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE)
+  set (3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE OFF CACHE BOOL "Skip trying to find Dot")
+endif()
+
+if (3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_DOXYGEN_DOT_EXECUTABLE)
+endif()
+
+if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR (NOT 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOXYGEN_DOT_EXECUTABLE))
+
+  set (DOXYGEN_SKIP_DOT ${3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE})
+  find_package (Doxygen)
+  
+  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE AND DOXYGEN_EXECUTABLE)
+    set (3RDPARTY_DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE FILEPATH "The Path to the doxygen command" FORCE)
+  endif()
+  
+  if (NOT 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOXYGEN_DOT_EXECUTABLE AND DOXYGEN_DOT_EXECUTABLE)
+    set (3RDPARTY_DOXYGEN_DOT_EXECUTABLE "${DOXYGEN_DOT_EXECUTABLE}" CACHE FILEPATH "The path to the dot program used by doxygen" FORCE)
+  endif()
+endif()
+
+if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_EXECUTABLE}")
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_EXECUTABLE)
+endif()
+
+if (NOT 3RDPARTY_DOXYGEN_SKIP_DOT_EXECUTABLE)
+  if (NOT 3RDPARTY_DOXYGEN_DOT_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_DOT_EXECUTABLE}")
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_DOT_EXECUTABLE)
+  endif()
+endif()
+
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET (DOXYGEN_SKIP_DOT)
+OCCT_CHECK_AND_UNSET (DOXYGEN_EXECUTABLE)
+OCCT_CHECK_AND_UNSET (DOXYGEN_DOT_EXECUTABLE)
--- a/adm/templates/freeimage.cmake
+++ b/adm/templates/freeimage.cmake
--- a/adm/templates/freeimageplus.cmake
+++ b/adm/templates/freeimageplus.cmake
--- a/adm/templates/freetype.cmake
+++ b/adm/templates/freetype.cmake
@@ -11,8 +11,8 @@ endif()
 # store ENV{FREETYPE_DIR}
 SET (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})

-# include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")

 OCCT_MAKE_COMPILER_SHORT_NAME()
 OCCT_MAKE_COMPILER_BITNESS()
@@ -59,9 +59,7 @@ if (WIN32)
  endif()
 endif()

-message (STATUS "Info: CMake default freetype search start...")
 find_package(Freetype)
-message (STATUS "Info: CMake default freetype search end")

 # ft2build header
 if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
@@ -73,7 +71,6 @@ endif()
 if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
  # cmake (version is < 3.0) doesn't find ftheader.h of freetype (version is >= 2.5.1)
  # do search taking into account freetype structure of 2.5.1 version
-  message (STATUS "Info: CMake default search doesn't found FREETYPE_INCLUDE_DIR_freetype2")
  find_path (FREETYPE_INCLUDE_DIR_freetype2 NAMES
                                             freetype/config/ftheader.h
                                             config/ftheader.h
@@ -87,12 +84,6 @@ if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_fre
                                           PATH_SUFFIXES include/freetype2 include freetype2
                                           NO_DEFAULT_PATH)
  find_path (FREETYPE_INCLUDE_DIR_freetype2 NAMES freetype/config/ftheader.h config/ftheader.h)
-  
-  if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
-    message (STATUS "Info: FREETYPE_INCLUDE_DIR_freetype2 is NOT found by additional search")
-  else()
-    message (STATUS "Info: FREETYPE_INCLUDE_DIR_freetype2 is found by additional search")
-  endif()
 elseif (FREETYPE_INCLUDE_DIR_freetype2 OR EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
    get_filename_component (3RDPARTY_FREETYPE_DIR_ABS "${3RDPARTY_FREETYPE_DIR}" ABSOLUTE)
@@ -110,7 +101,7 @@ elseif (FREETYPE_INCLUDE_DIR_freetype2 OR EXISTS "${FREETYPE_INCLUDE_DIR_freetyp

      if (TMP_FREETYPE2 OR NOT EXISTS "${TMP_FREETYPE2}")
        set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "${TMP_FREETYPE2}" CACHE FILEPATH "the path of freetype2" FORCE)
-        
+
        # hide and remove TMP_FREETYPE2
        mark_as_advanced (TMP_FREETYPE2)
        unset (TMP_FREETYPE2)
@@ -154,7 +145,7 @@ if (FREETYPE_LIBRARY AND EXISTS "${FREETYPE_LIBRARY}")
  if (NOT 3RDPARTY_FREETYPE_LIBRARY)
    set (3RDPARTY_FREETYPE_LIBRARY "${FREETYPE_LIBRARY}" CACHE FILEPATH "freetype library" FORCE)
  endif()
-  
+
  if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
    get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
    set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE FILEPATH "The directory containing freetype library" FORCE)
@@ -169,7 +160,7 @@ if (FREETYPE_LIBRARY AND EXISTS "${FREETYPE_LIBRARY}")
      set (3RDPARTY_FREETYPE_DLL "3RDPARTY_FREETYPE_DLL-NOTFOUND" CACHE FILEPATH "freetype shared library" FORCE)
      find_library (3RDPARTY_FREETYPE_DLL freetype PATHS "${FREETYPE_LIBRARY_PARENT_DIR}/bin" NO_DEFAULT_PATH)
    endif()
-    
+
    if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
      get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
      set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE FILEPATH "The directory containing freetype shared library" FORCE)
@@ -208,7 +199,9 @@ else()
 endif()

 if (WIN32)
-  if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
+  if (3RDPARTY_FREETYPE_DLL OR EXISTS "${3RDPARTY_FREETYPE_DLL}")
+    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
+  else()
    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_DLL_DIR)
  endif()
 endif()
@@ -216,12 +209,41 @@ endif()
 if (INSTALL_FREETYPE)

  OCCT_MAKE_OS_WITH_BITNESS()
-  OCCT_MAKE_BUILD_POSTFIX()
-
  if (WIN32)
-    install (FILES "${3RDPARTY_FREETYPE_DLL}"     DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+    install (FILES "${3RDPARTY_FREETYPE_DLL}"
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (FILES "${3RDPARTY_FREETYPE_DLL}"
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (FILES "${3RDPARTY_FREETYPE_DLL}"
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
  else()
-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+    get_filename_component(ABS_PATH ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
+    get_filename_component(FREETYPELIB ${3RDPARTY_FREETYPE_LIBRARY} NAME)
+
+    install (FILES "${ABS_PATH}"
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${FREETYPELIB}.6)
+    install (FILES "${ABS_PATH}"
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${FREETYPELIB}.6)
+    install (FILES "${ABS_PATH}"
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             RENAME ${FREETYPELIB}.6)
+  endif()
+
+  set (USED_3RDPARTY_FREETYPE_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_DLL_DIR})
+  else()
+    set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
  endif()
 endif()

--- a/adm/templates/gl2ps.cmake
+++ b/adm/templates/gl2ps.cmake
--- a/adm/templates/glx.cmake
+++ b/adm/templates/glx.cmake
--- a/adm/templates/occt_defs_flags.cmake
+++ b/adm/templates/occt_defs_flags.cmake
@@ -40,7 +40,6 @@ if (IS_DEBUG_C)
  message (STATUS "-DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 endif()
-
 # enable parallel compilation on MSVC 9 and above
 if (MSVC AND NOT MSVC70 AND NOT MSVC80)
  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP")
@@ -49,7 +48,6 @@ endif()
 # generate a single response file which enlist all of the object files
 SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
 SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-
 # increase compiler warnings level (-W4 for MSVC, -Wall for GCC)
 if (MSVC)
  if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
@@ -61,6 +59,10 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()

+if (DEFINED CMAKE_COMPILER_IS_GNUCXX OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+  set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+endif()
+
 set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
 set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")

--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -0,0 +1,340 @@
+#
+macro (OCCT_CHECK_AND_UNSET VARNAME)
+  if (DEFINED ${VARNAME})
+    unset (${VARNAME} CACHE)
+  endif()
+endmacro()
+
+macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
+
+  if (WIN32)
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
+  endif()
+endmacro()
+
+# COMPILER_BITNESS variable
+macro (OCCT_MAKE_COMPILER_BITNESS)
+  math (EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
+endmacro()
+
+# OS_WITH_BIT
+macro (OCCT_MAKE_OS_WITH_BITNESS)
+
+  OCCT_MAKE_COMPILER_BITNESS()
+
+  if (WIN32)
+    set (OS_WITH_BIT "win${COMPILER_BITNESS}")
+  elseif(APPLE)
+    set (OS_WITH_BIT "mac${COMPILER_BITNESS}")
+  else()
+    set (OS_WITH_BIT "lin${COMPILER_BITNESS}")
+  endif()
+endmacro()
+
+# COMPILER variable
+macro (OCCT_MAKE_COMPILER_SHORT_NAME)
+  if (MSVC)
+    if (MSVC70)
+      set (COMPILER vc7)
+    elseif (MSVC80)
+      set (COMPILER vc8)
+    elseif (MSVC90)
+      set (COMPILER vc9)
+    elseif (MSVC10)
+      set (COMPILER vc10)
+    elseif (MSVC11)
+      set (COMPILER vc11)
+    elseif (MSVC12)
+      set (COMPILER vc12)
+    endif()
+  elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
+    set (COMPILER gcc)
+  elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+    set (COMPILER gxx)
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set (COMPILER clang)
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    set (COMPILER icc)
+  else()
+    set (COMPILER ${CMAKE_GENERATOR})
+    string (REGEX REPLACE " " "" COMPILER ${COMPILER})
+  endif()
+endmacro()
+
+function (SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
+  file (GLOB SUB_ITEMS "${MAIN_DIRECTORY}/*")
+
+  foreach (ITEM ${SUB_ITEMS})
+    if (IS_DIRECTORY "${ITEM}")
+      get_filename_component (ITEM_NAME "${ITEM}" NAME)
+      list (APPEND LOCAL_RESULT "${ITEM_NAME}")
+    endif()
+  endforeach()
+  set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
+endfunction()
+
+function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  OCCT_MAKE_COMPILER_BITNESS()
+
+  string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
+
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*${COMPILER}.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}")
+
+  SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)
+
+  foreach (SEARCH_TEMPLATE ${SEARCH_TEMPLATES})
+    if (LOCAL_RESULT)
+      BREAK()
+    endif()
+
+    foreach (SUBDIR_NAME ${SUBDIR_NAME_LIST})
+      string (TOLOWER "${SUBDIR_NAME}" lower_SUBDIR_NAME)
+
+      string (REGEX MATCH "${SEARCH_TEMPLATE}" DUMMY_VAR "${lower_SUBDIR_NAME}")
+      if (DUMMY_VAR)
+        list (APPEND LOCAL_RESULT ${SUBDIR_NAME})
+      endif()
+    endforeach()
+  endforeach()
+
+  if (LOCAL_RESULT)
+    list (LENGTH "${LOCAL_RESULT}" LOC_LEN)
+    math (EXPR LAST_ELEMENT_INDEX "${LOC_LEN}-1")
+    list (GET LOCAL_RESULT ${LAST_ELEMENT_INDEX} DUMMY)
+    set (${RESULT} ${DUMMY} PARENT_SCOPE)
+  endif()
+endfunction()
+
+macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
+    if (IS_DIRECTORY "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
+      # first of all, install original files
+      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+
+      # secondly, rewrite original files with patched ones
+      install (DIRECTORY "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    else()
+      install (FILES     "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    endif()
+  else()
+    if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}")
+      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    else()
+      install (FILES     "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    endif()
+  endif()
+endmacro()
+
+macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE FINAL_NAME DESTINATION_PATH)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}")
+    configure_file("${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  else()
+    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  endif()
+
+  install(FILES "${OCCT_BINARY_DIR}/${FINAL_NAME}" DESTINATION  "${DESTINATION_PATH}")
+endmacro()
+
+macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_OCCT_DIR TEMPLATE_HEADER_PATH ROOT_TARGET_OCCT_DIR OCCT_USED_TOOLKITS)
+  set (OCCT_SOURCE_DIRS)
+
+  foreach (OCCT_USED_TOOLKIT ${OCCT_USED_TOOLKITS})
+    # append parent folder
+    list (APPEND OCCT_SOURCE_DIRS ${OCCT_USED_TOOLKIT})
+
+    # append all required package folders
+    set (OCCT_USED_TOOLKIT_DEPS)
+    if (EXISTS "${ROOT_OCCT_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
+      file (STRINGS "${ROOT_OCCT_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
+    endif()
+
+    foreach (OCCT_USED_TOOLKIT_DEP ${OCCT_USED_TOOLKIT_DEPS})
+      list (APPEND OCCT_SOURCE_DIRS ${OCCT_USED_TOOLKIT_DEP})
+    endforeach()
+  endforeach()
+
+  foreach (OCCT_SOURCE_DIR ${OCCT_SOURCE_DIRS})
+    # get all header files from each src folder 
+    file (GLOB OCCT_HEADER_FILES "${ROOT_OCCT_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${ROOT_OCCT_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
+
+    install (FILES ${OCCT_HEADER_FILES} DESTINATION "${INSTALL_DIR}/inc")
+
+    # create new file including found header
+    foreach (OCCT_HEADER_FILE ${OCCT_HEADER_FILES})
+      get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
+      configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
+    endforeach()
+  endforeach()
+endmacro()
+
+macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH)
+  # first of all, copy original files
+  file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_COPIED_OBJECT}")
+    # secondly, rewrite original files with patched ones
+    file (COPY "${BUILD_PATCH_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+  endif()
+endmacro()
+
+macro (OCCT_CONFIGURE BEING_CONGIRUGED_FILE FINAL_NAME)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}")
+    configure_file("${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  else()
+    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  endif()
+endmacro()
+
+function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
+  set (${USE_PRODUCT} OFF PARENT_SCOPE)
+
+  if (NOT USED_TOOLKITS)
+    message(STATUS "Warning: the list of being used toolkits is empty")
+  else()
+    foreach (USED_TOOLKIT ${USED_TOOLKITS})
+      if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
+        file (READ "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
+      elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
+        file (READ "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
+      endif()
+
+      string (REGEX MATCH "${CSF_VAR_NAME}" DOES_FILE_CONTAIN "${FILE_CONTENT}")
+
+      if (DOES_FILE_CONTAIN)
+        set (${USE_PRODUCT} ON PARENT_SCOPE)
+        break()
+      endif()
+    endforeach()
+  endif()
+endfunction()
+
+function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
+  set (LOCAL_FILE_CONTENT)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${FILE_NAME}")
+    file (STRINGS "${BUILD_PATCH_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
+  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
+  endif()
+
+  set (${FILE_CONTENT} ${LOCAL_FILE_CONTENT} PARENT_SCOPE)
+endfunction()
+
+# Function to determine if TOOLKIT is OCCT toolkit
+function (IS_OCCT_TOOLKIT TOOLKIT_NAME MODULES IS_TOOLKIT_FOUND)
+  set (${IS_TOOLKIT_FOUND} OFF PARENT_SCOPE)
+  foreach (MODULE ${${MODULES}})
+    set (TOOLKITS ${${MODULE}_TOOLKITS})
+    list (FIND TOOLKITS ${TOOLKIT_NAME} FOUND)
+
+    if (NOT ${FOUND} EQUAL -1)
+      set (${IS_TOOLKIT_FOUND} ON PARENT_SCOPE)
+    endif()
+  endforeach(MODULE)
+endfunction()
+
+# TOOLKIT_DEPS is defined with dependencies from file src/TOOLKIT_NAME/EXTERNLIB.
+# CSF_ variables are ignored
+function (OCCT_TOOLKIT_DEP TOOLKIT_NAME TOOLKIT_DEPS)
+  FILE_TO_LIST ("src/${TOOLKIT_NAME}/EXTERNLIB" FILE_CONTENT)
+
+  #list (APPEND LOCAL_TOOLKIT_DEPS ${TOOLKIT_NAME})
+  set (LOCAL_TOOLKIT_DEPS)
+  foreach (FILE_CONTENT_LINE ${FILE_CONTENT})
+    string (REGEX MATCH "^TK" TK_FOUND ${FILE_CONTENT_LINE})
+    if ("${FILE_CONTENT_LINE}" STREQUAL "DRAWEXE" OR NOT "${TK_FOUND}" STREQUAL "")
+      list (APPEND LOCAL_TOOLKIT_DEPS ${FILE_CONTENT_LINE})
+    endif()
+  endforeach()
+
+  set (${TOOLKIT_DEPS} ${LOCAL_TOOLKIT_DEPS} PARENT_SCOPE)
+endfunction()
+
+# TOOLKIT_FULL_DEPS is defined with complete dependencies (all levels)
+function (OCCT_TOOLKIT_FULL_DEP TOOLKIT_NAME TOOLKIT_FULL_DEPS)
+  # first level dependencies are stored in LOCAL_TOOLKIT_FULL_DEPS
+  OCCT_TOOLKIT_DEP (${TOOLKIT_NAME} LOCAL_TOOLKIT_FULL_DEPS)
+
+  list (LENGTH LOCAL_TOOLKIT_FULL_DEPS LIST_LENGTH)
+  set (LIST_INDEX 0)
+  while (LIST_INDEX LESS LIST_LENGTH)
+    list (GET LOCAL_TOOLKIT_FULL_DEPS ${LIST_INDEX} CURRENT_TOOLKIT)
+    OCCT_TOOLKIT_DEP (${CURRENT_TOOLKIT} CURRENT_TOOLKIT_DEPS)
+
+    # append toolkits are not contained
+    foreach (CURRENT_TOOLKIT_DEP ${CURRENT_TOOLKIT_DEPS})
+      set (CURRENT_TOOLKIT_DEP_FOUND OFF)
+      foreach (LOCAL_TOOLKIT_FULL_DEP ${LOCAL_TOOLKIT_FULL_DEPS})
+        if ("${CURRENT_TOOLKIT_DEP}" STREQUAL "${LOCAL_TOOLKIT_FULL_DEP}")
+          set (CURRENT_TOOLKIT_DEP_FOUND ON)
+          break()
+        endif()
+      endforeach()
+      if ("${CURRENT_TOOLKIT_DEP_FOUND}" STREQUAL "OFF")
+        list (APPEND LOCAL_TOOLKIT_FULL_DEPS ${CURRENT_TOOLKIT_DEP})
+      endif()
+    endforeach()
+
+    # increment the list index
+    MATH(EXPR LIST_INDEX "${LIST_INDEX}+1")
+
+    # calculate new length
+    list (LENGTH LOCAL_TOOLKIT_FULL_DEPS LIST_LENGTH)
+  endwhile()
+
+  set (${TOOLKIT_FULL_DEPS} ${LOCAL_TOOLKIT_FULL_DEPS} PARENT_SCOPE)
+endfunction()
+
+# Function to get list of modules and toolkits from file adm/MODULES.
+# Creates list <$MODULE_LIST> to store list of MODULES and
+# <NAME_OF_MODULE>_TOOLKITS foreach module to store its toolkits.
+function (OCCT_MODULES_AND_TOOLKITS MODULE_LIST)
+  FILE_TO_LIST ("adm/MODULES" FILE_CONTENT)
+
+  foreach (CONTENT_LINE ${FILE_CONTENT})
+    string (REPLACE " " ";" CONTENT_LINE ${CONTENT_LINE})
+    list (GET CONTENT_LINE 0 MODULE_NAME)
+    list (REMOVE_AT CONTENT_LINE 0)
+    list (APPEND ${MODULE_LIST} ${MODULE_NAME})
+    # (!) REMOVE THE LINE BELOW (implicit variables)
+    set (${MODULE_NAME}_TOOLKITS ${CONTENT_LINE} PARENT_SCOPE)
+  endforeach()
+
+  set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
+endfunction()
+
+# Returns OCCT version string from file Standard_Version.hxx (if available)
+function (OCCT_VERSION OCCT_VERSION_VAR)
+  set (OCC_VERSION_COMPLETE "7.1.0")
+  set (OCC_VERSION_DEVELOPMENT "")
+  
+  set (OCCT_VERSION_LOCALVAR "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}")
+
+  set (STANDARD_VERSION_FILE "${CMAKE_SOURCE_DIR}/src/Standard/Standard_Version.hxx")
+  if (EXISTS "${STANDARD_VERSION_FILE}")
+    foreach (SOUGHT_VERSION OCC_VERSION_COMPLETE OCC_VERSION_DEVELOPMENT)
+      file (STRINGS "${STANDARD_VERSION_FILE}" ${SOUGHT_VERSION} REGEX "^#define ${SOUGHT_VERSION} .*")
+      string (REGEX REPLACE ".*${SOUGHT_VERSION} .*\"([^ ]+)\".*" "\\1" ${SOUGHT_VERSION} "${${SOUGHT_VERSION}}" )
+    endforeach()
+    
+    if (NOT "${OCC_VERSION_DEVELOPMENT}" STREQUAL "")
+      set (OCCT_VERSION_LOCALVAR "${OCC_VERSION_COMPLETE}.${OCC_VERSION_DEVELOPMENT}")
+    else()
+      set (OCCT_VERSION_LOCALVAR "${OCC_VERSION_COMPLETE}")
+    endif()
+  endif()
+
+  set (${OCCT_VERSION_VAR} "${OCCT_VERSION_LOCALVAR}" PARENT_SCOPE)
+endfunction()
+
--- a/adm/templates/opencl.cmake
+++ b/adm/templates/opencl.cmake
--- a/adm/cmake/tbb.cmake
+++ b/adm/cmake/tbb.cmake
@@ -0,0 +1,252 @@
+# tbb
+
+if (NOT DEFINED INSTALL_TBB)
+  set (INSTALL_TBB OFF CACHE BOOL "Is tbb required to be copied into install directory")
+endif()
+
+# tbb directory
+if (NOT DEFINED 3RDPARTY_TBB_DIR)
+  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
+endif()
+
+# tbb include directory
+if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of the tbb")
+endif()
+
+# tbb library file (with absolute path)
+if (NOT DEFINED 3RDPARTY_TBB_LIBRARY OR NOT 3RDPARTY_TBB_LIBRARY_DIR)
+  set (3RDPARTY_TBB_LIBRARY "" CACHE FILEPATH "tbb library" FORCE)
+endif()
+
+# tbb library directory
+if (NOT DEFINED 3RDPARTY_TBB_LIBRARY_DIR)
+  set (3RDPARTY_TBB_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tbb library")
+endif()
+
+# tbb malloc library file (with absolute path)
+if (NOT DEFINED 3RDPARTY_TBBMALLOC_LIBRARY OR NOT 3RDPARTY_TBBMALLOC_LIBRARY_DIR)
+  set (3RDPARTY_TBBMALLOC_LIBRARY "" CACHE FILEPATH "tbb malloc library" FORCE)
+endif()
+
+# tbb malloc library directory
+if (NOT DEFINED 3RDPARTY_TBBMALLOC_LIBRARY_DIR)
+  set (3RDPARTY_TBBMALLOC_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tbb malloc library")
+endif()
+
+# tbb shared library (with absolute path)
+if (WIN32)
+  if (NOT DEFINED 3RDPARTY_TBB_DLL OR NOT 3RDPARTY_TBB_DLL_DIR)
+    set (3RDPARTY_TBB_DLL "" CACHE FILEPATH "tbb shared library" FORCE)
+  endif()
+endif()
+
+# tbb shared library directory
+if (WIN32 AND NOT DEFINED 3RDPARTY_TBB_DLL_DIR)
+  set (3RDPARTY_TBB_DLL_DIR "" CACHE FILEPATH "The directory containing tbb shared library")
+endif()
+
+# tbb malloc shared library (with absolute path)
+if (WIN32)
+  if (NOT DEFINED 3RDPARTY_TBBMALLOC_DLL OR NOT 3RDPARTY_TBBMALLOC_DLL_DIR)
+    set (3RDPARTY_TBBMALLOC_DLL "" CACHE FILEPATH "tbb malloc shared library" FORCE)
+  endif()
+endif()
+
+# tbb malloc shared library directory
+if (WIN32 AND NOT DEFINED 3RDPARTY_TBBMALLOC_DLL_DIR)
+  set (3RDPARTY_TBBMALLOC_DLL_DIR "" CACHE FILEPATH "The directory containing tbb malloc shared library")
+endif()
+
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+
+# search for product directory inside 3RDPARTY_DIR directory
+if (NOT 3RDPARTY_TBB_DIR AND 3RDPARTY_DIR)
+  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" "TBB" TBB_DIR_NAME)
+  if (TBB_DIR_NAME)
+    message (STATUS "Info: TBB: ${TBB_DIR_NAME} folder is used")
+    set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+  endif()
+endif()
+
+OCCT_MAKE_COMPILER_BITNESS()
+
+if (${COMPILER_BITNESS} STREQUAL 32)
+  set (TBB_ARCH_NAME ia32)
+else()
+  set (TBB_ARCH_NAME intel64)
+endif()
+
+# search for include directory in defined 3rdparty directory
+if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  set (3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing the headers of tbb" FORCE)
+  find_path (3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include" NO_DEFAULT_PATH)
+  find_path (3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include")
+endif()
+
+if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE FILEPATH "The directory containing the headers of tbb" FORCE)
+endif()
+
+OCCT_MAKE_COMPILER_SHORT_NAME()
+
+# TBB_COMPILER_FOLER
+#if (WIN32)
+  set (TBB_COMPILER_FOLER ${COMPILER})
+#else()
+#  set (TBB_COMPILER_FOLER ${COMPILER})
+#endif()
+
+# search for tbb and tbb malloc library in defined 3rdparty directory
+foreach (LIBRARY_NAME TBB TBBMALLOC)
+  if (NOT WIN32)
+    file (GLOB TBB_SUBDIRS RELATIVE ${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/ ${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/*)
+    list (SORT TBB_SUBDIRS)
+    list (REVERSE TBB_SUBDIRS)
+    list (LENGTH TBB_SUBDIRS TBB_SUBDIRS_LENGTH)
+    set (TBB_SUBDIR_FIRST "")
+    if (${TBB_SUBDIRS_LENGTH})
+      list (GET TBB_SUBDIRS 0 TBB_SUBDIR_FIRST)
+      set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_SUBDIR_FIRST}")
+    endif()
+  endif()
+  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR)
+    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${LIBRARY_NAME} library" FORCE)
+  elseif (3RDPARTY_${LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
+    get_filename_component(3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR_TMP "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}" PATH)
+    if (NOT "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" STREQUAL "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR_TMP}")
+      set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${LIBRARY_NAME} library" FORCE)
+    endif()
+  endif()
+
+  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
+    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "3RDPARTY_${LIBRARY_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "Path to library of ${LIBRARY_NAME}" FORCE)
+
+    string (TOLOWER "${LIBRARY_NAME}" lower_LIBRARY_NAME)
+    find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${lower_LIBRARY_NAME} PATHS
+                                                                         "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}"
+                                                                         "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
+                                                                         NO_DEFAULT_PATH)
+
+      # second search if previous one do not find anything
+      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME})
+  endif()
+
+  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}")
+    get_filename_component(3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}" PATH)
+  endif()
+  set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} library" FORCE)
+
+  # search for dll in defined 3rdparty directory (just for win case)
+  if (WIN32)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+
+    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL_DIR)
+      set (3RDPARTY_${LIBRARY_NAME}_DLL "" CACHE FILEPATH "${LIBRARY_NAME} shared library" FORCE)
+    elseif (3RDPARTY_${LIBRARY_NAME}_DLL AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
+      get_filename_component(3RDPARTY_${LIBRARY_NAME}_DLL_DIR_TMP "${3RDPARTY_${LIBRARY_NAME}_DLL}" PATH)
+      if (NOT "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}" STREQUAL "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR_TMP}")
+        set (3RDPARTY_${LIBRARY_NAME}_DLL "" CACHE FILEPATH "${LIBRARY_NAME} shared library" FORCE)
+      endif()
+    endif()
+
+    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
+      set (3RDPARTY_${LIBRARY_NAME}_DLL "3RDPARTY_${LIBRARY_NAME}_DLL-NOTFOUND" CACHE FILEPATH "Path to shared library of ${LIBRARY_NAME}" FORCE)
+
+      find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME} PATHS
+                                                                 "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}"
+                                                                 "${3RDPARTY_TBB_DIR}/bin/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
+                                                                 NO_DEFAULT_PATH)
+
+        # second search if previous one do not find anything
+        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME})
+    endif()
+
+    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL_DIR OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}")
+      get_filename_component(3RDPARTY_${LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${LIBRARY_NAME}_DLL}" PATH)
+      set (3RDPARTY_${LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} shared library" FORCE)
+    endif()
+  endif() # end dll search
+endforeach() # end tbb / tbbmalloc
+
+# include found paths to common variables
+if (3RDPARTY_TBB_INCLUDE_DIR AND EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+endif()
+
+foreach (LIBRARY_NAME TBB TBBMALLOC)
+  if (3RDPARTY_${LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR)
+  endif()
+
+  if (WIN32)
+    if (3RDPARTY_${LIBRARY_NAME}_DLL OR EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}")
+    else()
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBRARY_NAME}_DLL_DIR)
+    endif()
+  endif()
+endforeach()
+
+# install tbb
+if (INSTALL_TBB)
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+
+  if (WIN32)
+    install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+  else()
+    get_filename_component(TBBLIB ${3RDPARTY_TBB_LIBRARY} NAME)
+    get_filename_component(TBBMALLOCLIB ${3RDPARTY_TBBMALLOC_LIBRARY} NAME)
+
+    install (FILES ${3RDPARTY_TBB_LIBRARY}.2
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${TBBLIB}.2)
+    install (FILES ${3RDPARTY_TBB_LIBRARY}.2
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${TBBLIB}.2)
+    install (FILES ${3RDPARTY_TBB_LIBRARY}.2
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             RENAME ${TBBLIB}.2)
+
+    install (FILES ${3RDPARTY_TBBMALLOC_LIBRARY}.2
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${TBBMALLOCLIB}.2)
+    install (FILES ${3RDPARTY_TBBMALLOC_LIBRARY}.2
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${TBBMALLOCLIB}.2)
+    install (FILES ${3RDPARTY_TBBMALLOC_LIBRARY}.2
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             RENAME ${TBBMALLOCLIB}.2)
+  endif()
+
+  set (USED_3RDPARTY_TBB_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
+  else()
+    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
+  endif()
+endif()
+
+mark_as_advanced (3RDPARTY_TBB_LIBRARY 3RDPARTY_TBBMALLOC_LIBRARY 3RDPARTY_TBB_DLL 3RDPARTY_TBBMALLOC_DLL)
--- a/adm/templates/tcl.cmake
+++ b/adm/templates/tcl.cmake
@@ -88,10 +88,10 @@ macro (DIR_SUBDIR_FILE_FIT LIBNAME)
    else()
      set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
    endif()
-    
+
    # tcl/tk library dir
    if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
-      
+
      string (REGEX MATCH "${3RDPARTY_TCL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
      if (NOT DOES_PATH_CONTAIN)
        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
@@ -168,14 +168,14 @@ foreach (LIBNAME TCL TK)
  if (NOT 3RDPARTY_${LIBNAME}_LIBRARY)
    if (${LIBNAME}_LIBRARY AND EXISTS "${${LIBNAME}_LIBRARY}")
      set (3RDPARTY_${LIBNAME}_LIBRARY "${${LIBNAME}_LIBRARY}" CACHE FILEPATH "${LIBNAME} library" FORCE)
-      
+
      if (NOT 3RDPARTY_${LIBNAME}_LIBRARY_DIR)
        get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY}" PATH)
        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
      endif()
    endif()
  endif()
-  
+

  if (WIN32)
    if (NOT 3RDPARTY_${LIBNAME}_DLL)
@@ -190,7 +190,7 @@ foreach (LIBNAME TCL TK)
          get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" PATH)
          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT}/bin")
        endif()
-        
+
        set (3RDPARTY_${LIBNAME}_DLL "3RDPARTY_${LIBNAME}_DLL-NOTFOUND" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
        find_library (3RDPARTY_${LIBNAME}_DLL NAMES ${LIBNAME_L}86 ${LIBNAME_L}85
                                              PATHS "${DLL_FOLDER_FOR_SEARCH}"
@@ -199,7 +199,7 @@ foreach (LIBNAME TCL TK)
  endif()

  DIR_SUBDIR_FILE_FIT(${LIBNAME})
-  
+

  # tcl/tk dir and library
  if (NOT 3RDPARTY_${LIBNAME}_LIBRARY)
@@ -207,17 +207,17 @@ foreach (LIBNAME TCL TK)
    find_library (3RDPARTY_${LIBNAME}_LIBRARY NAMES ${LIBNAME_L}8.6 ${LIBNAME_L}86 ${LIBNAME_L}8.5 ${LIBNAME_L}85
                                              PATHS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}"
                                              NO_DEFAULT_PATH)
-    
+
    # search in another place if previous search doesn't find anything
-    find_library (3RDPARTY_${LIBNAME}_LIBRARY NAMES ${LIBNAME_L}8.6 ${LIBNAME_L}86 ${LIBNAME_L}8.5 ${LIBNAME_L}85 
+    find_library (3RDPARTY_${LIBNAME}_LIBRARY NAMES ${LIBNAME_L}8.6 ${LIBNAME_L}86 ${LIBNAME_L}8.5 ${LIBNAME_L}85
                                              PATHS "${3RDPARTY_TCL_DIR}/lib"
-                                              NO_DEFAULT_PATH)    
-    
+                                              NO_DEFAULT_PATH)
+

    if (NOT 3RDPARTY_${LIBNAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
      set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
    endif()
-    
+
    if (NOT 3RDPARTY_${LIBNAME}_LIBRARY_DIR AND 3RDPARTY_${LIBNAME}_LIBRARY)
      get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY}" PATH)
      set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
@@ -228,14 +228,13 @@ foreach (LIBNAME TCL TK)
  if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
    get_filename_component (${LIBNAME}_LIBRARY_NAME "${3RDPARTY_${LIBNAME}_LIBRARY}" NAME)
    string(REGEX REPLACE "^.*${LIBNAME_L}([0-9]\\.*[0-9]).*$" "\\1" ${LIBNAME}_LIBRARY_VERSION "${${LIBNAME}_LIBRARY_NAME}")
-    
+
    if (NOT "${${LIBNAME}_LIBRARY_VERSION}" STREQUAL "${${LIBNAME}_LIBRARY_NAME}")
      set (3RDPARTY_${LIBNAME}_LIBRARY_VERSION "${${LIBNAME}_LIBRARY_VERSION}")
    else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
      message (STATUS "Info: ${LIBNAME} version isn't found")
    endif()
  endif()
-  

  set (3RDPARTY_${LIBNAME}_LIBRARY_VERSION_WITH_DOT "")
  if (3RDPARTY_${LIBNAME}_LIBRARY_VERSION)
@@ -257,23 +256,23 @@ foreach (LIBNAME TCL TK)
          get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" PATH)
          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT}/bin")
        endif()
-        
+
        set (3RDPARTY_${LIBNAME}_DLL "3RDPARTY_${LIBNAME}_DLL-NOTFOUND" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
        find_library (3RDPARTY_${LIBNAME}_DLL NAMES ${LIBNAME_L}${3RDPARTY_${LIBNAME}_LIBRARY_VERSION}
                                              PATHS "${DLL_FOLDER_FOR_SEARCH}"
                                              NO_DEFAULT_PATH)
-        
+
        if (NOT 3RDPARTY_${LIBNAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
          set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
        endif()
-      
+
        if (NOT 3RDPARTY_${LIBNAME}_DLL_DIR AND 3RDPARTY_${LIBNAME}_DLL)
          get_filename_component (3RDPARTY_${LIBNAME}_DLL_DIR "${3RDPARTY_${LIBNAME}_DLL}" PATH)
          set (3RDPARTY_${LIBNAME}_DLL_DIR "${3RDPARTY_${LIBNAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
        endif()
    endif()
  endif()
-  
+
  # include found paths to common variables
  if (3RDPARTY_${LIBNAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
@@ -288,7 +287,9 @@ foreach (LIBNAME TCL TK)
  endif()

  if (WIN32)
-    if (NOT 3RDPARTY_${LIBNAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
+    if (3RDPARTY_${LIBNAME}_DLL OR EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+    else()
      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBNAME}_DLL_DIR)
    endif()
  endif()
@@ -296,21 +297,53 @@ endforeach()

 # install tcltk
 if (INSTALL_TCL)
-  # include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+  # include occt macros. compiler_bitness, os_wiht_bit, compiler
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")

  OCCT_MAKE_OS_WITH_BITNESS()
  OCCT_MAKE_COMPILER_SHORT_NAME()
-  OCCT_MAKE_BUILD_POSTFIX()

  if (WIN32)
-    install (FILES ${3RDPARTY_TCL_DLL} ${3RDPARTY_TK_DLL} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+    # tcl 8.6 requires zlib. install all dlls from tcl bin folder that may contain zlib also
+
+    # collect and install all dlls from tcl/tk dll dirs
+    file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
+    file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
+    install (FILES ${TCL_DLLS} ${TK_DLLS}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (FILES ${TCL_DLLS} ${TK_DLLS}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (FILES ${TCL_DLLS} ${TK_DLLS}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
  else()
-    install (FILES ${3RDPARTY_TCL_LIBRARY} ${3RDPARTY_TK_LIBRARY} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+    get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
+    install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+
+    get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
+    install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
  endif()

  if (TCL_TCLSH_VERSION)
-    # tcl is required to install in lib folder (without ${BUILD_POSTFIX})
+    # tcl is required to install in lib folder (without)
    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
@@ -318,6 +351,15 @@ if (INSTALL_TCL)
    message (STATUS "\nWarning: tclX.X and tkX.X subdirs won't be copyied during the installation process.")
    message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
  endif()
+
+  set (USED_3RDPARTY_TCL_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_DLL_DIR})
+  else()
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_LIBRARY_DIR})
+  endif()
 endif()

 mark_as_advanced (3RDPARTY_TCL_LIBRARY 3RDPARTY_TK_LIBRARY 3RDPARTY_TCL_DLL 3RDPARTY_TK_DLL)
--- a/adm/cmake/vtk.cmake
+++ b/adm/cmake/vtk.cmake
@@ -0,0 +1,183 @@
+# vtk
+
+if (NOT DEFINED INSTALL_VTK)
+  set (INSTALL_VTK OFF CACHE BOOL "Is vtk required to be copied into install directory")
+endif()
+
+# vtk directory
+if (NOT DEFINED 3RDPARTY_VTK_DIR)
+  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing vtk")
+endif()
+
+# vtk include directory
+if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
+  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of vtk")
+endif()
+
+# vtk library directory
+if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
+  set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing vtk library")
+endif()
+
+# vtk dll directory
+if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
+  set (3RDPARTY_VTK_DLL_DIR "" CACHE FILEPATH "The directory containing VTK dll")
+endif()
+
+# search for vtk in user defined directory
+if (NOT 3RDPARTY_VTK_DIR AND 3RDPARTY_DIR)
+  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" vtk VTK_DIR_NAME)
+  if (VTK_DIR_NAME)
+    set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing vtk product" FORCE)
+  endif()
+endif()
+
+# find installed vtk
+find_package(VTK QUIET)
+
+# find native vtk
+if (NOT VTK_FOUND)
+  find_package(VTK QUIET PATHS "${3RDPARTY_VTK_DIR}")
+endif()
+
+if (NOT VTK_FOUND AND NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
+  message(SEND_ERROR "VTK not found. Set the 3RDPARTY_VTK_DIR cmake cache entry to the directory containing VTK.")
+  set (3RDPARTY_VTK_DIR "3RDPARTY_VTK_DIR-NOTFOUND" CACHE PATH "The directory containing vtk product" FORCE)
+endif()
+
+set(VTK_VERSION "")
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+  get_filename_component(3RDPARTY_VTK_DIR_NAME "${3RDPARTY_VTK_DIR}" NAME)
+  string(REGEX MATCH "^VTK-([0-9].[0-9])" VTK_VERSION "${3RDPARTY_VTK_DIR_NAME}")
+  set(VTK_VERSION "${CMAKE_MATCH_1}")
+  if (NOT 3RDPARTY_VTK_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
+    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_DIR}/include/vtk-${VTK_VERSION}" CACHE FILEPATH "The directory containing includes of VTK" FORCE)
+  endif()
+  if (NOT 3RDPARTY_VTK_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
+    if(EXISTS "${3RDPARTY_VTK_DIR}/lib")
+      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_DIR}/lib" CACHE FILEPATH "The directory containing libs of VTK" FORCE)
+    elseif (EXISTS "${3RDPARTY_VTK_DIR}/lib")
+      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_DIR}/lib" CACHE FILEPATH "The directory containing libs of VTK" FORCE)
+    endif()
+  endif()
+  if(3RDPARTY_VTK_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_VTK_LIBRARY_DIR}")
+  endif()
+endif()
+
+# vtk libraries
+# lib
+set (VTK_LIBRARY_NAMES vtkCommonCore-${VTK_VERSION}.lib vtkCommonDataModel-${VTK_VERSION}.lib vtkCommonExecutionModel-${VTK_VERSION}.lib
+                       vtkCommonMath-${VTK_VERSION}.lib vtkCommonTransforms-${VTK_VERSION}.lib vtkRenderingCore-${VTK_VERSION}.lib
+                       vtkRenderingOpenGL-${VTK_VERSION}.lib vtkFiltersGeneral-${VTK_VERSION}.lib vtkIOCore-${VTK_VERSION}.lib
+                       vtkIOImage-${VTK_VERSION}.lib vtkImagingCore-${VTK_VERSION}.lib vtkInteractionStyle-${VTK_VERSION}.lib )
+
+#dll
+set (VTK_DLL_NAMES vtkCommonComputationalGeometry-${VTK_VERSION}.dll
+                   vtkCommonCore-${VTK_VERSION}.dll
+                   vtkCommonDataModel-${VTK_VERSION}.dll
+                   vtkCommonExecutionModel-${VTK_VERSION}.dll
+                   vtkCommonMath-${VTK_VERSION}.dll
+                   vtkCommonMisc-${VTK_VERSION}.dll
+                   vtkCommonSystem-${VTK_VERSION}.dll
+                   vtkCommonTransforms-${VTK_VERSION}.dll
+                   vtkDICOMParser-${VTK_VERSION}.dll
+                   vtkFiltersCore-${VTK_VERSION}.dll
+                   vtkFiltersExtraction-${VTK_VERSION}.dll
+                   vtkFiltersGeneral-${VTK_VERSION}.dll
+                   vtkFiltersGeometry-${VTK_VERSION}.dll
+                   vtkFiltersSources-${VTK_VERSION}.dll
+                   vtkFiltersStatistics-${VTK_VERSION}.dll
+                   vtkIOCore-${VTK_VERSION}.dll
+                   vtkIOImage-${VTK_VERSION}.dll
+                   vtkImagingCore-${VTK_VERSION}.dll
+                   vtkImagingFourier-${VTK_VERSION}.dll
+                   vtkImagingHybrid-${VTK_VERSION}.dll
+                   vtkInteractionStyle-${VTK_VERSION}.dll
+                   vtkRenderingCore-${VTK_VERSION}.dll
+                   vtkRenderingOpenGL-${VTK_VERSION}.dll
+                   vtkalglib-${VTK_VERSION}.dll
+                   vtkjpeg-${VTK_VERSION}.dll
+                   vtkmetaio-${VTK_VERSION}.dll
+                   vtkpng-${VTK_VERSION}.dll
+                   vtksys-${VTK_VERSION}.dll
+                   vtktiff-${VTK_VERSION}.dll
+                   vtkzlib-${VTK_VERSION}.dll )
+
+# search for dll directory
+if (WIN32)
+  if (NOT 3RDPARTY_VTK_DLL_DIR OR NOT EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+    if(EXISTS "${3RDPARTY_VTK_DIR}/bin")
+      set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bin" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
+    elseif (EXISTS "${3RDPARTY_VTK_DIR}/bind")
+      set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bind" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
+    endif()
+  endif()
+
+  if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_VTK_DLL_DIR}")
+  endif()
+endif() 
+
+OCCT_CHECK_AND_UNSET(VTK_DIR)
+
+if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_VTK_INCLUDE_DIR}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_DIR)
+endif()
+
+if (INSTALL_VTK)
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  if (WIN32)
+    if(3RDPARTY_VTK_DLL_DIR AND EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+      foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
+        set (3RDPARTY_VTK_DLL "3RDPARTY_VTK_DLL-NOTFOUND" CACHE FILEPATH "VTK shared library" FORCE)
+        find_library(3RDPARTY_VTK_DLL "${VTK_DLL_NAME}" PATHS "${3RDPARTY_VTK_DLL_DIR}" NO_DEFAULT_PATH)
+        if (NOT 3RDPARTY_VTK_DLL OR NOT EXISTS "${3RDPARTY_VTK_DLL}")
+          list (APPEND 3RDPARTY_NOT_INCLUDED "${3RDPARTY_VTK_DLL}")
+        else()
+          install (FILES ${3RDPARTY_VTK_DLL}
+                   CONFIGURATIONS Release
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+          install (FILES ${3RDPARTY_VTK_DLL}
+                   CONFIGURATIONS RelWithDebInfo
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+          install (FILES ${3RDPARTY_VTK_DLL}
+                   CONFIGURATIONS Debug
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+        endif()
+      endforeach()
+      OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL)
+    endif()
+  else ()
+    foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
+      string(REPLACE ".dll" ".so.1" VTK_DLL_NAME "${VTK_DLL_NAME}")
+      install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
+              CONFIGURATIONS Release
+              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+              RENAME "lib${VTK_DLL_NAME}")
+      install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
+              CONFIGURATIONS RelWithDebInfo
+              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+              RENAME "lib${VTK_DLL_NAME}")
+      install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
+              CONFIGURATIONS Debug
+              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+              RENAME "lib${VTK_DLL_NAME}")
+    endforeach()
+  endif()
+
+  set (USED_3RDPARTY_VTK_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
+  else()
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
+  endif()
+endif()
+
+mark_as_advanced (VTK_INCLUDE_DIRS VTK_LIBRARY_DIRS VTK_DIR)
--- a/adm/genconf.tcl
+++ b/adm/genconf.tcl
@@ -0,0 +1,517 @@
+#!/usr/bin/tclsh
+
+package require Tk
+
+source "./adm/genconfdeps.tcl"
+
+set aRowIter 0
+frame .myFrame -padx 5 -pady 5
+pack  .myFrame -fill both -expand 1
+
+set SYS_VS_LIST {}
+set SYS_VC_LIST {}
+set SYS_VCVARS_LIST {}
+
+# detect installed Visual Studio instances from global environment
+if { [info exists ::env(VS130COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 201x (vc13)"
+  lappend ::SYS_VC_LIST "vc13"
+  lappend ::SYS_VCVARS_LIST "%VS130COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS120COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2013 (vc12)"
+  lappend ::SYS_VC_LIST "vc12"
+  lappend ::SYS_VCVARS_LIST "%VS120COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS110COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2012 (vc11)"
+  lappend ::SYS_VC_LIST "vc11"
+  lappend ::SYS_VCVARS_LIST "%VS110COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS100COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2010 (vc10)"
+  lappend ::SYS_VC_LIST "vc10"
+  lappend ::SYS_VCVARS_LIST "%VS100COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS90COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2008 (vc9)"
+  lappend ::SYS_VC_LIST "vc9"
+  lappend ::SYS_VCVARS_LIST "%VS90COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+if { [info exists ::env(VS80COMNTOOLS)] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2005 (vc8)"
+  lappend ::SYS_VC_LIST "vc8"
+  lappend ::SYS_VCVARS_LIST "%VS80COMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+}
+lappend ::SYS_VS_LIST "Custom"
+lappend ::SYS_VC_LIST "vcX"
+lappend ::SYS_VCVARS_LIST "%VSXXCOMNTOOLS%..\\..\\VC\\vcvarsall.bat"
+
+set aVcVerIndex [lsearch $::SYS_VC_LIST $::VCVER]
+set ::VSVER  [lindex $::SYS_VS_LIST     $aVcVerIndex]
+if { "$::VCVARS" == "" } {
+  set ::VCVARS [lindex $::SYS_VCVARS_LIST $aVcVerIndex]
+}
+
+proc wokdep:gui:Close {} {
+  # if changed ask
+  exit
+}
+
+proc wokdep:gui:SwitchConfig {} {
+  set ::VCVER  [lindex $::SYS_VC_LIST     [.myFrame.myVsCombo current]]
+  set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsCombo current]]
+
+  set ::CSF_OPT_INC {}
+  set ::CSF_OPT_LIB32 {}
+  set ::CSF_OPT_LIB64 {}
+  set ::CSF_OPT_BIN32 {}
+  set ::CSF_OPT_BIN64 {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:SwitchArch {} {
+  if { "$::ARCH" == "32" } {
+    wokdep:gui:Show32Bitness ::aRowIter
+  }
+  if { "$::ARCH" == "64" } {
+    wokdep:gui:Show64Bitness ::aRowIter
+  }
+
+  if { [llength [grid info .myFrame.mySave]] != 0 } {
+    grid forget .myFrame.mySave .myFrame.myClose
+  }
+
+  # Bottom section
+  grid .myFrame.mySave  -row $::aRowIter -column 4 -columnspan 2
+  grid .myFrame.myClose -row $::aRowIter -column 6 -columnspan 2
+}
+
+proc wokdep:gui:UpdateList {} {
+  set anIncErrs   {}
+  set anLib32Errs {}
+  set anLib64Errs {}
+  set anBin32Errs {}
+  set anBin64Errs {}
+  wokdep:SearchTclTk     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  wokdep:SearchFreeType  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  wokdep:SearchX11       anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  if { "$::HAVE_FREEIMAGE" == "true" } {
+    wokdep:SearchFreeImage anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_GL2PS" == "true" } {
+    wokdep:SearchGL2PS   anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_TBB" == "true" } {
+    wokdep:SearchTBB     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_OPENCL" == "true" } {
+    wokdep:SearchOpenCL  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::HAVE_VTK" == "true" } {
+    wokdep:SearchVTK  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::CHECK_QT4" == "true" } {
+    wokdep:SearchQt4     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+  if { "$::CHECK_JDK" == "true" } {
+    wokdep:SearchJDK     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+
+  .myFrame.myIncErrLbl   configure -text [join $anIncErrs   "\n"]
+  .myFrame.myLib32ErrLbl configure -text [join $anLib32Errs "\n"]
+  .myFrame.myLib64ErrLbl configure -text [join $anLib64Errs "\n"]
+  .myFrame.myBin32ErrLbl configure -text [join $anBin32Errs "\n"]
+  .myFrame.myBin64ErrLbl configure -text [join $anBin64Errs "\n"]
+}
+
+proc wokdep:gui:BrowseVcVars {} {
+  set aResult [tk_chooseDirectory -initialdir $::VCVARS -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    set ::VCVARS $aResult
+  }
+}
+
+proc wokdep:gui:BrowsePartiesRoot {} {
+  set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    set ::PRODUCTS_PATH $aResult
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddIncPath {} {
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_INC "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddLib32Path {} {
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_LIB32 "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddLib64Path {} {
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_LIB64 "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddBin32Path {} {
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_BIN32 "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:AddBin64Path {} {
+  set aResult [tk_chooseDirectory -title "Choose a directory"]
+  if { "$aResult" != "" } {
+    lappend ::CSF_OPT_BIN64 "$aResult"
+    wokdep:gui:UpdateList
+  }
+}
+
+proc wokdep:gui:RemoveIncPath {} {
+  set aSelIndices [.myFrame.myIncList curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myIncList delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:RemoveLib32Path {} {
+  set aSelIndices [.myFrame.myLib32List curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myLib32List delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:RemoveLib64Path {} {
+  set aSelIndices [.myFrame.myLib64List curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myLib64List delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:RemoveBin32Path {} {
+  set aSelIndices [.myFrame.myBin32List curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myBin32List delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:RemoveBin64Path {} {
+  set aSelIndices [.myFrame.myBin64List curselection]
+  if { [llength $aSelIndices] != 0 } {
+    .myFrame.myBin64List delete [lindex $aSelIndices 0]
+  }
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:ResetIncPath {} {
+  set ::CSF_OPT_INC {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:ResetLib32Path {} {
+  set ::CSF_OPT_LIB32 {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:ResetLib64Path {} {
+  set ::CSF_OPT_LIB64 {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:ResetBin32Path {} {
+  set ::CSF_OPT_BIN32 {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:ResetBin64Path {} {
+  set ::CSF_OPT_BIN64 {}
+  wokdep:gui:UpdateList
+}
+
+proc wokdep:gui:Show32Bitness { theRowIter } {
+  upvar $theRowIter aRowIter
+
+  if { [llength [grid info .myFrame.myLib64Lbl]] != 0 } {
+    grid forget .myFrame.myLib64Lbl .myFrame.myLib64List   .myFrame.myLib64Scrl
+    grid forget .myFrame.myLib64Add .myFrame.myLib64Remove .myFrame.myLib64Clear .myFrame.myLib64ErrLbl
+    grid forget .myFrame.myBin64Lbl .myFrame.myBin64List   .myFrame.myBin64Scrl
+    grid forget .myFrame.myBin64Add .myFrame.myBin64Remove .myFrame.myBin64Clear .myFrame.myBin64ErrLbl
+  }
+
+  # Additional libraries (32-bit) search paths
+  grid .myFrame.myLib32Lbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+  grid .myFrame.myLib32List   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+  grid .myFrame.myLib32Scrl   -row $aRowIter -column 5 -rowspan 4
+  grid .myFrame.myLib32Add    -row $aRowIter -column 6
+  incr aRowIter
+  #grid .myFrame.myLib32Edit   -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib32Remove -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib32Clear  -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib32ErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+
+  # Additional executables (32-bit) search paths
+  grid .myFrame.myBin32Lbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+  grid .myFrame.myBin32List   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+  grid .myFrame.myBin32Scrl   -row $aRowIter -column 5 -rowspan 4
+  grid .myFrame.myBin32Add    -row $aRowIter -column 6
+  incr aRowIter
+  #grid .myFrame.myBin32Edit   -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin32Remove -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin32Clear  -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin32ErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+}
+
+proc wokdep:gui:Show64Bitness { theRowIter } {
+  upvar $theRowIter aRowIter
+
+  if { [llength [grid info .myFrame.myLib32Lbl]] != 0 } {
+    grid forget .myFrame.myLib32Lbl .myFrame.myLib32List   .myFrame.myLib32Scrl
+    grid forget .myFrame.myLib32Add .myFrame.myLib32Remove .myFrame.myLib32Clear .myFrame.myLib32ErrLbl
+    grid forget .myFrame.myBin32Lbl .myFrame.myBin32List   .myFrame.myBin32Scrl
+    grid forget .myFrame.myBin32Add .myFrame.myBin32Remove .myFrame.myBin32Clear .myFrame.myBin32ErrLbl
+  }
+
+  # Additional libraries (64-bit) search paths
+  grid .myFrame.myLib64Lbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+  grid .myFrame.myLib64List   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+  grid .myFrame.myLib64Scrl   -row $aRowIter -column 5 -rowspan 4
+  grid .myFrame.myLib64Add    -row $aRowIter -column 6
+  incr aRowIter
+  #grid .myFrame.myLib64Edit   -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib64Remove -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib64Clear  -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myLib64ErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+
+  # Additional executables (64-bit) search paths
+  grid .myFrame.myBin64Lbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+  grid .myFrame.myBin64List   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+  grid .myFrame.myBin64Scrl   -row $aRowIter -column 5 -rowspan 4
+  grid .myFrame.myBin64Add    -row $aRowIter -column 6
+  incr aRowIter
+  #grid .myFrame.myBin64Edit   -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin64Remove -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin64Clear  -row $aRowIter -column 6
+  incr aRowIter
+  grid .myFrame.myBin64ErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+}
+
+# Header
+ttk::label    .myFrame.myVsLbl       -text "Visual Studio configuration" -relief solid -padding {5 5 80 5}
+ttk::combobox .myFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 30
+ttk::combobox .myFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
+entry         .myFrame.myVcEntry     -textvariable VCVER  -width 6
+entry         .myFrame.myVcVarsEntry -textvariable VCVARS -width 70
+ttk::button   .myFrame.myVcBrowseBtn -text "Browse" -command wokdep:gui:BrowseVcVars
+
+#
+ttk::label    .myFrame.myOcctBuildLbl -text "OCCT headers configuration" -relief solid -padding {5 5 80 5}
+checkbutton   .myFrame.myScutsCheck   -offvalue "false" -onvalue "true" -variable SHORTCUT_HEADERS
+ttk::label    .myFrame.myScutsLbl     -text "Short-cut headers instead original ones in inc"
+
+#
+ttk::label    .myFrame.mySrchLbl       -text "3rd-parties search path" -relief solid -padding {5 5 80 5}
+entry         .myFrame.mySrchEntry     -textvariable PRODUCTS_PATH -width 80
+ttk::button   .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
+checkbutton   .myFrame.myFImageCheck   -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myFImageLbl     -text "Use FreeImage"
+checkbutton   .myFrame.myGl2psCheck    -offvalue "false" -onvalue "true" -variable HAVE_GL2PS     -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myGl2psLbl      -text "Use GL2PS"
+checkbutton   .myFrame.myTbbCheck      -offvalue "false" -onvalue "true" -variable HAVE_TBB       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myTbbLbl        -text "Use Intel TBB"
+checkbutton   .myFrame.myOpenClCheck   -offvalue "false" -onvalue "true" -variable HAVE_OPENCL    -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myOpenClLbl     -text "Use OpenCL"
+checkbutton   .myFrame.myMacGLXCheck   -offvalue "false" -onvalue "true" -variable MACOSX_USE_GLX
+ttk::label    .myFrame.myMacGLXLbl     -text "Use X11 for windows drawing"
+ttk::label    .myFrame.myVtkLbl        -text "Use VTK"
+checkbutton   .myFrame.myVtkCheck      -offvalue "false" -onvalue "true" -variable HAVE_VTK       -command wokdep:gui:UpdateList
+checkbutton   .myFrame.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myQt4Lbl        -text "Search Qt4"
+checkbutton   .myFrame.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myJDKLbl        -text "Search JDK"
+
+# Additional headers search paths
+ttk::label    .myFrame.myIncLbl    -text "Additional headers search paths" -relief solid -padding {5 5 80 5}
+scrollbar     .myFrame.myIncScrl   -command ".myFrame.myIncList yview"
+listbox       .myFrame.myIncList   -listvariable CSF_OPT_INC -width 80 -height 5 -yscrollcommand ".myFrame.myIncScrl set"
+ttk::button   .myFrame.myIncAdd    -text "Add"     -command wokdep:gui:AddIncPath
+ttk::button   .myFrame.myIncEdit   -text "Edit"
+ttk::button   .myFrame.myIncRemove -text "Remove"  -command wokdep:gui:RemoveIncPath
+ttk::button   .myFrame.myIncClear  -text "Reset"   -command wokdep:gui:ResetIncPath
+ttk::label    .myFrame.myIncErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional libraries (32-bit) search paths
+ttk::label    .myFrame.myLib32Lbl    -text "Additional libraries (32-bit) search paths" -relief solid -padding {5 5 80 5}
+scrollbar     .myFrame.myLib32Scrl   -command ".myFrame.myLib32List yview"
+listbox       .myFrame.myLib32List   -listvariable CSF_OPT_LIB32 -width 80 -height 5 -yscrollcommand ".myFrame.myLib32Scrl set"
+ttk::button   .myFrame.myLib32Add    -text "Add"     -command wokdep:gui:AddLib32Path
+ttk::button   .myFrame.myLib32Edit   -text "Edit"
+ttk::button   .myFrame.myLib32Remove -text "Remove"  -command wokdep:gui:RemoveLib32Path
+ttk::button   .myFrame.myLib32Clear  -text "Reset"   -command wokdep:gui:ResetLib32Path
+ttk::label    .myFrame.myLib32ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional libraries (64-bit) search paths
+ttk::label    .myFrame.myLib64Lbl    -text "Additional libraries (64-bit) search paths" -relief solid -padding {5 5 80 5}
+scrollbar     .myFrame.myLib64Scrl   -command ".myFrame.myLib64List yview"
+listbox       .myFrame.myLib64List   -listvariable CSF_OPT_LIB64 -width 80 -height 5 -yscrollcommand ".myFrame.myLib64Scrl set"
+ttk::button   .myFrame.myLib64Add    -text "Add"     -command wokdep:gui:AddLib64Path
+ttk::button   .myFrame.myLib64Edit   -text "Edit"
+ttk::button   .myFrame.myLib64Remove -text "Remove"  -command wokdep:gui:RemoveLib64Path
+ttk::button   .myFrame.myLib64Clear  -text "Reset"   -command wokdep:gui:ResetLib64Path
+ttk::label    .myFrame.myLib64ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional executables (32-bit) search paths
+ttk::label    .myFrame.myBin32Lbl    -text "Additional executables (32-bit) search paths" -relief solid -padding {5 5 80 5}
+scrollbar     .myFrame.myBin32Scrl   -command ".myFrame.myBin32List yview"
+listbox       .myFrame.myBin32List   -listvariable CSF_OPT_BIN32 -width 80 -height 5 -yscrollcommand ".myFrame.myBin32Scrl set"
+ttk::button   .myFrame.myBin32Add    -text "Add"     -command wokdep:gui:AddBin32Path
+ttk::button   .myFrame.myBin32Edit   -text "Edit"
+ttk::button   .myFrame.myBin32Remove -text "Remove"  -command wokdep:gui:RemoveBin32Path
+ttk::button   .myFrame.myBin32Clear  -text "Reset"   -command wokdep:gui:ResetBin32Path
+ttk::label    .myFrame.myBin32ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Additional executables (64-bit) search paths
+ttk::label    .myFrame.myBin64Lbl    -text "Additional executables (64-bit) search paths" -relief solid -padding {5 5 80 5}
+scrollbar     .myFrame.myBin64Scrl   -command ".myFrame.myBin64List yview"
+listbox       .myFrame.myBin64List   -listvariable CSF_OPT_BIN64 -width 80 -height 5 -yscrollcommand ".myFrame.myBin64Scrl set"
+ttk::button   .myFrame.myBin64Add    -text "Add"     -command wokdep:gui:AddBin64Path
+ttk::button   .myFrame.myBin64Edit   -text "Edit"
+ttk::button   .myFrame.myBin64Remove -text "Remove"  -command wokdep:gui:RemoveBin64Path
+ttk::button   .myFrame.myBin64Clear  -text "Reset"   -command wokdep:gui:ResetBin64Path
+ttk::label    .myFrame.myBin64ErrLbl -text "Error: " -foreground red -padding {5 5 5 5}
+
+# Bottom
+ttk::button   .myFrame.mySave  -text "Save"  -command wokdep:SaveCustom
+ttk::button   .myFrame.myClose -text "Close" -command wokdep:gui:Close
+
+# Create grid
+# Header
+if { "$tcl_platform(platform)" == "windows" } {
+  grid .myFrame.myVsLbl       -row $aRowIter -column 0 -columnspan 10 -sticky w
+  incr aRowIter
+  grid .myFrame.myVsCombo     -row $aRowIter -column 0 -columnspan 2 -sticky w
+  grid .myFrame.myArchCombo   -row $aRowIter -column 2 -sticky w
+  incr aRowIter
+  grid .myFrame.myVcEntry     -row $aRowIter -column 0
+  grid .myFrame.myVcVarsEntry -row $aRowIter -column 1 -columnspan 4 -sticky w
+  grid .myFrame.myVcBrowseBtn -row $aRowIter -column 6
+  incr aRowIter
+}
+
+#
+grid .myFrame.myOcctBuildLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+grid .myFrame.myScutsCheck   -row $aRowIter -column 0 -sticky e
+grid .myFrame.myScutsLbl     -row $aRowIter -column 1 -columnspan 2 -sticky w
+incr aRowIter
+#
+grid .myFrame.mySrchLbl       -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+grid .myFrame.mySrchEntry     -row $aRowIter -column 0 -columnspan 5
+grid .myFrame.mySrchBrowseBtn -row $aRowIter -column 6
+incr aRowIter
+grid .myFrame.myFImageCheck   -row $aRowIter -column 0 -sticky e
+grid .myFrame.myFImageLbl     -row $aRowIter -column 1 -sticky w
+grid .myFrame.myQt4Check      -row $aRowIter -column 2 -sticky e
+grid .myFrame.myQt4Lbl        -row $aRowIter -column 3 -sticky w
+incr aRowIter
+grid .myFrame.myGl2psCheck    -row $aRowIter -column 0 -sticky e
+grid .myFrame.myGl2psLbl      -row $aRowIter -column 1 -sticky w
+grid .myFrame.myJDKCheck      -row $aRowIter -column 2 -sticky e
+grid .myFrame.myJDKLbl        -row $aRowIter -column 3 -sticky w
+incr aRowIter
+grid .myFrame.myTbbCheck      -row $aRowIter -column 0 -sticky e
+grid .myFrame.myTbbLbl        -row $aRowIter -column 1 -sticky w
+incr aRowIter
+grid .myFrame.myOpenClCheck   -row $aRowIter -column 0 -sticky e
+grid .myFrame.myOpenClLbl     -row $aRowIter -column 1 -sticky w
+incr aRowIter
+grid .myFrame.myVtkCheck      -row $aRowIter -column 0 -sticky e
+grid .myFrame.myVtkLbl        -row $aRowIter -column 1 -sticky w
+incr aRowIter
+if { "$::tcl_platform(os)" == "Darwin" } {
+  grid .myFrame.myMacGLXCheck -row $aRowIter -column 0 -sticky e
+  grid .myFrame.myMacGLXLbl   -row $aRowIter -column 1 -sticky w
+  incr aRowIter
+}
+
+# Additional headers search paths
+grid .myFrame.myIncLbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+grid .myFrame.myIncList   -row $aRowIter -column 0 -rowspan 4 -columnspan 5
+grid .myFrame.myIncScrl   -row $aRowIter -column 5 -rowspan 4
+grid .myFrame.myIncAdd    -row $aRowIter -column 6
+incr aRowIter
+#grid .myFrame.myIncEdit   -row $aRowIter -column 6
+incr aRowIter
+grid .myFrame.myIncRemove -row $aRowIter -column 6
+incr aRowIter
+grid .myFrame.myIncClear  -row $aRowIter -column 6
+incr aRowIter
+grid .myFrame.myIncErrLbl -row $aRowIter -column 0 -columnspan 10 -sticky w
+incr aRowIter
+
+# Additional 32-bit search paths
+if { "$ARCH" == "32" } {
+  wokdep:gui:Show32Bitness aRowIter
+}
+
+# Additional 64-bit search paths
+if { "$ARCH" == "64" } {
+  wokdep:gui:Show64Bitness aRowIter
+}
+
+# Bottom section
+grid .myFrame.mySave  -row $aRowIter -column 4 -columnspan 2
+grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2
+
+# Bind events
+bind .myFrame.myVsCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchConfig
+}
+bind .myFrame.myArchCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchArch
+}
+
+.myFrame.mySrchEntry configure -validate all -validatecommand {
+  #return [file exists "$::PRODUCTS_PATH"]
+  wokdep:gui:UpdateList
+  return 1
+}
+
+wokdep:gui:UpdateList
--- a/adm/genconfdeps.tcl
+++ b/adm/genconfdeps.tcl
@@ -0,0 +1,996 @@
+#!/usr/bin/tclsh
+
+set ARCH "64"
+
+if { "$tcl_platform(platform)" == "unix" } {
+  set SYS_PATH_SPLITTER ":"
+  set SYS_LIB_PREFIX    "lib"
+  set SYS_EXE_SUFFIX    ""
+  if { "$tcl_platform(os)" == "Darwin" } {
+    set SYS_LIB_SUFFIX "dylib"
+  } else {
+    set SYS_LIB_SUFFIX "so"
+  }
+  set VCVER "gcc"
+  set VCVARS ""
+} elseif { "$tcl_platform(platform)" == "windows" } {
+  set SYS_PATH_SPLITTER ";"
+  set SYS_LIB_PREFIX    ""
+  set SYS_LIB_SUFFIX    "lib"
+  set SYS_EXE_SUFFIX    ".exe"
+  set VCVER  "vc10"
+  set VCVARS ""
+}
+
+set SHORTCUT_HEADERS "true"
+
+set HAVE_FREEIMAGE "false"
+set HAVE_GL2PS     "false"
+set HAVE_TBB       "false"
+set HAVE_OPENCL    "false"
+set HAVE_VTK       "false"
+set MACOSX_USE_GLX "false"
+set CHECK_QT4      "false"
+set CHECK_JDK      "false"
+set PRODUCTS_PATH ""
+set CSF_OPT_INC   [list]
+set CSF_OPT_LIB32 [list]
+set CSF_OPT_LIB64 [list]
+set CSF_OPT_BIN32 [list]
+set CSF_OPT_BIN64 [list]
+
+if { "$tcl_platform(pointerSize)" == "4" } {
+  set ARCH "32"
+}
+if { [info exists ::env(ARCH)] } {
+  set ARCH "$::env(ARCH)"
+}
+if { [info exists ::env(VCVER)] } {
+  set VCVER "$::env(VCVER)"
+}
+if { [info exists ::env(VCVARS)] } {
+  set VCVARS "$::env(VCVARS)"
+}
+if { [info exists ::env(SHORTCUT_HEADERS)] } {
+  set SHORTCUT_HEADERS "$::env(SHORTCUT_HEADERS)"
+}
+if { [info exists ::env(HAVE_FREEIMAGE)] } {
+  set HAVE_FREEIMAGE "$::env(HAVE_FREEIMAGE)"
+}
+if { [info exists ::env(HAVE_GL2PS)] } {
+  set HAVE_GL2PS "$::env(HAVE_GL2PS)"
+}
+if { [info exists ::env(HAVE_TBB)] } {
+  set HAVE_TBB "$::env(HAVE_TBB)"
+}
+if { [info exists ::env(HAVE_OPENCL)] } {
+  set HAVE_OPENCL "$::env(HAVE_OPENCL)"
+}
+if { [info exists ::env(HAVE_VTK)] } {
+  set HAVE_VTK "$::env(HAVE_VTK)"
+}
+if { [info exists ::env(MACOSX_USE_GLX)] } {
+  set MACOSX_USE_GLX "$::env(MACOSX_USE_GLX)"
+}
+if { [info exists ::env(CHECK_QT4)] } {
+  set CHECK_QT4 "$::env(CHECK_QT4)"
+}
+if { [info exists ::env(CHECK_JDK)] } {
+  set CHECK_JDK "$::env(CHECK_JDK)"
+}
+if { [info exists ::env(PRODUCTS_PATH)] } {
+  set PRODUCTS_PATH "$::env(PRODUCTS_PATH)"
+}
+if { [info exists ::env(CSF_OPT_INC)] } {
+  set CSF_OPT_INC [split "$::env(CSF_OPT_INC)" $::SYS_PATH_SPLITTER]
+}
+if { [info exists ::env(CSF_OPT_LIB32)] } {
+  set CSF_OPT_LIB32 [split "$::env(CSF_OPT_LIB32)" $::SYS_PATH_SPLITTER]
+}
+if { [info exists ::env(CSF_OPT_LIB64)] } {
+  set CSF_OPT_LIB64 [split "$::env(CSF_OPT_LIB64)" $::SYS_PATH_SPLITTER]
+}
+if { [info exists ::env(CSF_OPT_BIN32)] } {
+  set CSF_OPT_BIN32 [split "$::env(CSF_OPT_BIN32)" $::SYS_PATH_SPLITTER]
+}
+if { [info exists ::env(CSF_OPT_BIN64)] } {
+  set CSF_OPT_BIN64 [split "$::env(CSF_OPT_BIN64)" $::SYS_PATH_SPLITTER]
+}
+
+# Search header file in $::CSF_OPT_INC and standard paths
+proc wokdep:SearchHeader {theHeader} {
+  # search in custom paths
+  foreach anIncPath $::CSF_OPT_INC {
+    set aPath "${anIncPath}/${theHeader}"
+    if { [file exists "$aPath"] } {
+      return "$aPath"
+    }
+  }
+
+  # search in system
+  set aPath "/usr/include/${theHeader}"
+  if { [file exists "$aPath"] } {
+    return "$aPath"
+  }
+  return ""
+}
+
+# Search library file in $::CSF_OPT_LIB* and standard paths
+proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {
+  if { "$theSearchPath" != "" } {
+    set aPath "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    if { [file exists "$aPath"] } {
+      return "$aPath"
+    } else {
+      return ""
+    }
+  }
+
+  # search in custom paths
+  foreach aLibPath [set ::CSF_OPT_LIB$theBitness] {
+    set aPath "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    if { [file exists "$aPath"] } {
+      return "$aPath"
+    }
+  }
+
+  # search in system
+  if { "$::ARCH" == "$theBitness"} {
+    set aPath "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    if { [file exists "$aPath"] } {
+      return "$aPath"
+    }
+  }
+
+
+  if { "$::tcl_platform(os)" == "Linux" } {
+    if { "$theBitness" == "64" } {
+      set aPath "/usr/lib/x86_64-linux-gnu/lib${theLib}.so"
+      if { [file exists "$aPath"] } {
+        return "$aPath"
+      }
+    } else {
+      set aPath "/usr/lib/i386-linux-gnu/lib${theLib}.so"
+      if { [file exists "$aPath"] } {
+        return "$aPath"
+      }
+    }
+  }
+
+  return ""
+}
+
+# Search file in $::CSF_OPT_BIN* and standard paths
+proc wokdep:SearchBin {theBin theBitness {theSearchPath ""}} {
+  if { "$theSearchPath" != "" } {
+    set aPath "${theSearchPath}/${theBin}"
+    if { [file exists "$aPath"] } {
+      return "$aPath"
+    } else {
+      return ""
+    }
+  }
+
+  # search in custom paths
+  foreach aBinPath [set ::CSF_OPT_BIN$theBitness] {
+    set aPath "${aBinPath}/${theBin}"
+    if { [file exists "$aPath"] } {
+      return "$aPath"
+    }
+  }
+
+  # search in system
+  if { "$::ARCH" == "$theBitness"} {
+    set aPath "/usr/bin/${theBin}"
+    if { [file exists "$aPath"] } {
+      return "$aPath"
+    }
+  }
+
+  return ""
+}
+
+# Detect compiler C-runtime version 'vc*' and architecture '32'/'64'
+# to determine preferred path.
+proc wokdep:Preferred {theList theCmpl theArch} {
+  if { [llength $theList] == 0 } {
+    return ""
+  }
+
+  set aShortList {}
+  foreach aPath $theList {
+    if { [string first "$theCmpl" "$aPath"] != "-1" } {
+      lappend aShortList "$aPath"
+    }
+  }
+
+  if { [llength $aShortList] == 0 } {
+    #return [lindex $theList 0]
+    set aShortList $theList
+  }
+
+  set aVeryShortList {}
+  foreach aPath $aShortList {
+    if { [string first "$theArch" "$aPath"] != "-1" } {
+      lappend aVeryShortList "$aPath"
+    }
+  }
+  if { [llength $aVeryShortList] == 0 } {
+    return [lindex [lsort -decreasing $aShortList] 0]
+  }
+
+  return [lindex [lsort -decreasing $aVeryShortList] 0]
+}
+
+# Search Tcl/Tk libraries placement
+proc wokdep:SearchTclTk {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set tclver_maj 8
+  set tclver_min 6
+  
+  set isFound "true"
+  set aTclHPath [wokdep:SearchHeader "tcl.h"]
+  set aTkHPath  [wokdep:SearchHeader "tk.h"]
+  if { "$aTclHPath" == "" || "$aTkHPath" == "" } {
+    if { [file exists "/usr/include/tcl8.6/tcl.h"]
+      && [file exists "/usr/include/tcl8.6/tk.h" ] } {
+      lappend ::CSF_OPT_INC "/usr/include/tcl8.6"
+      set aTclHPath "/usr/include/tcl8.6/tcl.h"
+    } else {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tcl}*] "$::VCVER" "$::ARCH" ]
+      if { "$aPath" != "" && [file exists "$aPath/include/tcl.h"] && [file exists "$aPath/include/tk.h"] } {
+        lappend ::CSF_OPT_INC "$aPath/include"
+        set aTclHPath "$aPath/include/tcl.h"
+      } else {
+        lappend anErrInc "Error: 'tcl.h' or 'tk.h' not found (Tcl/Tk)"
+        set isFound "false"
+      }
+    }
+  }
+
+  # detect tcl version by parsing header file
+  if { $isFound } {
+    set fh [open $aTclHPath]
+    set tcl_h [read $fh]
+    close $fh
+    regexp {define\s+TCL_MAJOR_VERSION\s+([0-9]+)} $tcl_h dummy tclver_maj
+    regexp {define\s+TCL_MINOR_VERSION\s+([0-9]+)} $tcl_h dummy tclver_min
+  }
+
+  if { "$::tcl_platform(platform)" == "windows" } {
+    set aTclLibName "tcl${tclver_maj}${tclver_min}"
+    set aTkLibName  "tk${tclver_maj}${tclver_min}"
+  } else {
+    set aTclLibName "tcl${tclver_maj}.${tclver_min}"
+    set aTkLibName  "tk${tclver_maj}.${tclver_min}"
+  }
+
+  foreach anArchIter {64 32} {
+    set aTclLibPath [wokdep:SearchLib "$aTclLibName" "$anArchIter"]
+    set aTkLibPath  [wokdep:SearchLib "$aTkLibName"  "$anArchIter"]
+    if { "$aTclLibPath" == "" || "$aTkLibPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tcl}*] "$::VCVER" "$anArchIter" ]
+      set aTclLibPath [wokdep:SearchLib "$aTclLibName" "$anArchIter" "$aPath/lib"]
+      set aTkLibPath  [wokdep:SearchLib "$aTkLibName"  "$anArchIter" "$aPath/lib"]
+      if { "$aTclLibPath" != "" && "$aTkLibPath" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+      } else {
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aTclLibName}.${::SYS_LIB_SUFFIX}' or '${::SYS_LIB_PREFIX}${aTkLibName}.${::SYS_LIB_SUFFIX}' not found (Tcl/Tk)"
+        if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+      }
+    }
+
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aTclDllPath [wokdep:SearchBin "${aTclLibName}.dll" "$anArchIter"]
+      set aTkDllPath  [wokdep:SearchBin "${aTkLibName}.dll"  "$anArchIter"]
+      if { "$aTclDllPath" == "" || "$aTkDllPath" == "" } {
+        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tcl}*] "$::VCVER" "$anArchIter" ]
+        set aTclDllPath [wokdep:SearchBin "${aTclLibName}.dll" "$anArchIter" "$aPath/bin"]
+        set aTkDllPath  [wokdep:SearchBin "${aTkLibName}.dll"  "$anArchIter" "$aPath/bin"]
+        if { "$aTclDllPath" != "" && "$aTkDllPath" != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+        } else {
+          lappend anErrBin$anArchIter "Error: '${aTclLibName}.dll' or '${aTkLibName}.dll' not found (Tcl/Tk)"
+          if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+        }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Search FreeType library placement
+proc wokdep:SearchFreeType {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  set aFtBuildPath [wokdep:SearchHeader "ft2build.h"]
+
+  if { "$aFtBuildPath" == "" } {
+    # TODO - use `freetype-config --cflags` instead
+    set aSysFreeType "/usr/include/freetype2"
+    if { [file exists "$aSysFreeType/ft2build.h"] } {
+      lappend ::CSF_OPT_INC "$aSysFreeType"
+    } elseif { [file exists "$aSysFreeType/freetype2/ft2build.h"] } {
+      lappend ::CSF_OPT_INC "$aSysFreeType/freetype2"
+    } else {
+      set aSysFreeType "/usr/X11/include/freetype2"
+      if { [file exists "$aSysFreeType/ft2build.h"] } {
+        lappend ::CSF_OPT_INC "/usr/X11/include"
+        lappend ::CSF_OPT_INC "$aSysFreeType"
+      } else {
+        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freetype}*] "$::VCVER" "$::ARCH" ]
+        if {"$aPath" != ""} {
+          if {[file exists "$aPath/include/ft2build.h"]} {
+            lappend ::CSF_OPT_INC "$aPath/include"
+          } elseif {[file exists "$aPath/include/freetype2/ft2build.h"]} {
+            lappend ::CSF_OPT_INC "$aPath/include/freetype2"
+          }
+        } else {
+          lappend anErrInc "Error: 'freetype.h' not found (FreeType2)"
+          set isFound "false"
+        }
+      }
+    }
+  }
+
+  # parse 'freetype-config --libs'
+  set aConfLibPath ""
+  if { [catch { set aConfLibs [exec freetype-config --libs] } ] == 0 } {
+    foreach aPath [split $aConfLibs " "] {
+      if { [string first "-L" "$aPath"] == 0 } {
+        set aConfLibPath [string range "$aPath" 2 [string length "$aPath"]]
+      }
+    }
+  }
+
+  foreach anArchIter {64 32} {
+    set aFtLibPath [wokdep:SearchLib "freetype" "$anArchIter"]
+    if { "$aFtLibPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freetype}*] "$::VCVER" "$anArchIter" ]
+      set aFtLibPath [wokdep:SearchLib "freetype" "$anArchIter" "$aPath/lib"]
+      if { "$aFtLibPath" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+      } else {
+        set aFtLibPath [wokdep:SearchLib "freetype" "$anArchIter" "$aConfLibPath"]
+        if { "$aFtLibPath" != "" } {
+          lappend ::CSF_OPT_LIB$anArchIter "$aConfLibPath"
+        } else {
+          lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}freetype.${::SYS_LIB_SUFFIX}' not found (FreeType2)"
+          if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+        }
+      }
+    }
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aFtDllPath [wokdep:SearchBin "freetype.dll" "$anArchIter"]
+      if { "$aFtDllPath" == "" } {
+        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freetype}*] "$::VCVER" "$anArchIter" ]
+        set aFtDllPath [wokdep:SearchBin "freetype.dll" "$anArchIter" "$aPath/bin"]
+        if { "$aFtDllPath" != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+        } else {
+          set aFtDllPath [wokdep:SearchBin "freetype.dll" "$anArchIter" "$aPath/lib"]
+          if { "$aFtDllPath" != "" } {
+            lappend ::CSF_OPT_BIN$anArchIter "$aPath/lib"
+          } else {
+            lappend anErrBin$anArchIter "Error: 'freetype.dll' not found (FreeType2)"
+            if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+          }
+        }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Search FreeImage library placement
+proc wokdep:SearchFreeImage {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  # binary distribution has another layout
+  set aFImageDist     "Dist"
+  set aFImagePlusDist "Wrapper/FreeImagePlus/dist"
+
+  set isFound "true"
+  set aFImageHPath     [wokdep:SearchHeader "FreeImage.h"]
+  set aFImagePlusHPath [wokdep:SearchHeader "FreeImagePlus.h"]
+  if { "$aFImageHPath" == "" || "$aFImagePlusHPath"  == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freeimage}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/FreeImage.h"] && [file exists "$aPath/include/FreeImagePlus.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+    } elseif { "$aPath" != "" && [file exists "$aPath/$aFImageDist/FreeImage.h"] && [file exists "$aPath/$aFImagePlusDist/FreeImagePlus.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/$aFImageDist"
+      lappend ::CSF_OPT_INC "$aPath/$aFImagePlusDist"
+    } else {
+      lappend anErrInc "Error: 'FreeImage.h' or 'FreeImagePlus.h' not found (FreeImage)"
+      set isFound "false"
+    }
+  }
+
+  foreach anArchIter {64 32} {
+    set aFImageLibPath     [wokdep:SearchLib "freeimage"     "$anArchIter"]
+    set aFImagePlusLibPath [wokdep:SearchLib "freeimageplus" "$anArchIter"]
+    if { "$aFImageLibPath" == "" || "$aFImagePlusLibPath"  == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freeimage}*] "$::VCVER" "$anArchIter" ]
+      set aFImageLibPath     [wokdep:SearchLib "freeimage"     "$anArchIter" "$aPath/lib"]
+      set aFImagePlusLibPath [wokdep:SearchLib "freeimageplus" "$anArchIter" "$aPath/lib"]
+      if { "$aFImageLibPath" != "" && "$aFImagePlusLibPath"  != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+      } else {
+        set aFImageLibPath     [wokdep:SearchLib "freeimage"     "$anArchIter" "$aPath/$aFImageDist"]
+        set aFImagePlusLibPath [wokdep:SearchLib "freeimageplus" "$anArchIter" "$aPath/$aFImagePlusDist"]
+        if { "$aFImageLibPath" != "" && "$aFImagePlusLibPath"  != "" } {
+          lappend ::CSF_OPT_LIB$anArchIter "$aPath/$aFImageDist"
+          lappend ::CSF_OPT_LIB$anArchIter "$aPath/$aFImagePlusDist"
+        } else {
+          lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}freeimage.${::SYS_LIB_SUFFIX}' or '${::SYS_LIB_PREFIX}freeimageplus.${::SYS_LIB_SUFFIX}' not found (FreeImage)"
+          if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+        }
+      }
+    }
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aFImageDllPath     [wokdep:SearchBin "freeimage.dll"     "$anArchIter"]
+      set aFImagePlusDllPath [wokdep:SearchBin "freeimageplus.dll" "$anArchIter"]
+      if { "$aFImageDllPath" == "" || "$aFImagePlusDllPath" == "" } {
+        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freeimage}*] "$::VCVER" "$anArchIter" ]
+        set aFImageDllPath     [wokdep:SearchBin "freeimage.dll"     "$anArchIter" "$aPath/bin"]
+        set aFImagePlusDllPath [wokdep:SearchBin "freeimageplus.dll" "$anArchIter" "$aPath/bin"]
+        if { "$aFImageDllPath" != "" && "$aFImagePlusDllPath" != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+        } else {
+          set aFImageDllPath     [wokdep:SearchBin "freeimage.dll"     "$anArchIter" "$aPath/$aFImageDist"]
+          set aFImagePlusDllPath [wokdep:SearchBin "freeimageplus.dll" "$anArchIter" "$aPath/$aFImagePlusDist"]
+          if { "$aFImageDllPath" != "" && "$aFImagePlusDllPath" != "" } {
+            lappend ::CSF_OPT_BIN$anArchIter "$aPath/$aFImageDist"
+            lappend ::CSF_OPT_BIN$anArchIter "$aPath/$aFImagePlusDist"
+          } else {
+            lappend anErrBin$anArchIter "Error: 'freeimage.dll' or 'freeimageplus.dll' not found (FreeImage)"
+            if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+          }
+        }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Search GL2PS library placement
+proc wokdep:SearchGL2PS {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  set aGl2psHPath [wokdep:SearchHeader "gl2ps.h"]
+  if { "$aGl2psHPath"  == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{gl2ps}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/gl2ps.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+    } else {
+      lappend anErrInc "Error: 'gl2ps.h' not found (GL2PS)"
+      set isFound "false"
+    }
+  }
+
+  foreach anArchIter {64 32} {
+    set aGl2psLibPath [wokdep:SearchLib "gl2ps" "$anArchIter"]
+    if { "$aGl2psLibPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{gl2ps}*] "$::VCVER" "$anArchIter" ]
+      set aGl2psLibPath [wokdep:SearchLib "gl2ps" "$anArchIter" "$aPath/lib"]
+      if { "$aGl2psLibPath" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+      } else {
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}gl2ps.${::SYS_LIB_SUFFIX}' not found (GL2PS)"
+        if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+      }
+    }
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aGl2psDllPath [wokdep:SearchBin "gl2ps.dll" "$anArchIter"]
+      if { "$aGl2psDllPath" == "" } {
+        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{gl2ps}*] "$::VCVER" "$anArchIter" ]
+        set aGl2psDllPath [wokdep:SearchBin "gl2ps.dll" "$anArchIter" "$aPath/bin"]
+        if { "$aGl2psDllPath" != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+        } else {
+          set aGl2psDllPath [wokdep:SearchBin "gl2ps.dll" "$anArchIter" "$aPath/lib"]
+          if { "$aGl2psDllPath" != "" } {
+            lappend ::CSF_OPT_BIN$anArchIter "$aPath/lib"
+          } else {
+            lappend anErrBin$anArchIter "Error: 'gl2ps.dll' not found (GL2PS)"
+            if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+          }
+        }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Search TBB library placement
+proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  set aTbbHPath [wokdep:SearchHeader "tbb/scalable_allocator.h"]
+  if { "$aTbbHPath"  == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tbb}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/tbb/scalable_allocator.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+    } else {
+      lappend anErrInc "Error: 'tbb/scalable_allocator.h' not found (Intel TBB)"
+      set isFound "false"
+    }
+  }
+
+  foreach anArchIter {64 32} {
+    set aSubDir "ia32"
+    if { "$anArchIter" == "64"} {
+      set aSubDir "intel64"
+    }
+
+    set aTbbLibPath [wokdep:SearchLib "tbb" "$anArchIter"]
+    if { "$aTbbLibPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tbb}*] "$::VCVER" "$anArchIter" ]
+      set aTbbLibPath [wokdep:SearchLib "tbb" "$anArchIter" "$aPath/lib/$aSubDir/${::VCVER}"]
+      if { "$aTbbLibPath" == "" } {
+        # Set the path to the TBB library for Linux
+        if { "$::tcl_platform(platform)" != "windows" } {
+          set aSubDir "$aSubDir/cc4.1.0_libc2.4_kernel2.6.16.21"
+        }
+        set aTbbLibPath [wokdep:SearchLib "tbb" "$anArchIter" "$aPath/lib/$aSubDir"]
+        if { "$aTbbLibPath" != "" } {
+          lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib/$aSubDir"
+        }
+      } else {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib/$aSubDir/${::VCVER}"
+      }
+      if { "$aTbbLibPath" == "" } {
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}tbb.${::SYS_LIB_SUFFIX}' not found (Intel TBB)"
+        if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+      }
+    }
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aTbbDllPath [wokdep:SearchBin "tbb.dll" "$anArchIter"]
+      if { "$aTbbDllPath" == "" } {
+        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tbb}*] "$::VCVER" "$anArchIter" ]
+        set aTbbDllPath [wokdep:SearchBin "tbb.dll" "$anArchIter" "$aPath/bin/$aSubDir/${::VCVER}"]
+        if { "$aTbbDllPath" != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin/$aSubDir/${::VCVER}"
+        } else {
+          lappend anErrBin$anArchIter "Error: 'tbb.dll' not found (Intel TBB)"
+          if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+        }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Search OpenCL library placement
+proc wokdep:SearchOpenCL {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  if { "$::tcl_platform(os)" == "Darwin" } {
+    # OpenCL framework available since Mac OS X 16
+    return "$isFound"
+  }
+
+  set aCLHPath [wokdep:SearchHeader "CL/cl_gl.h"]
+  if { "$aCLHPath"  == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{OpenCL}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/CL/cl_gl.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+    } else {
+      lappend anErrInc "Error: 'CL/cl_gl.h' not found (OpenCL)"
+      set isFound "false"
+    }
+  }
+
+  foreach anArchIter {64 32} {
+    set aCLLibPath [wokdep:SearchLib "OpenCL" "$anArchIter"]
+    if { "$aCLLibPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{OpenCL}*] "$::VCVER" "$anArchIter" ]
+      set aCLLibPath [wokdep:SearchLib "OpenCL" "$anArchIter" "$aPath/lib"]
+      if { "$aCLLibPath" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+      } else {
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}OpenCL.${::SYS_LIB_SUFFIX}' not found (OpenCL)"
+        if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Auxiliary function, gets VTK version to set default search directory
+proc wokdep:VtkVersion { thePath } {
+  set aResult "6.1"
+
+  set aVtkRoot [lindex [regexp -all -inline {[0-9.]*} [file tail $thePath]] 0]
+  if { "$aVtkRoot" != "" } {
+    set aVtkRoot [regexp -inline {[0-9]*.[0-9]*} $aVtkRoot]
+    if { "$aVtkRoot" != "" } {
+    set aResult $aVtkRoot
+    }
+  }
+
+  return $aResult
+}
+
+# Search VTK library placement
+proc wokdep:SearchVTK {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  
+  set aVtkPath ""
+  set aVtkIncPath [wokdep:SearchHeader "vtkConfigure.h"]
+  set aVtkVer [wokdep:VtkVersion $aVtkIncPath]
+  if { "$aVtkIncPath" == ""} {
+    set aPathList [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{VTK}*]
+    set aVtkPath [wokdep:Preferred "$aPathList" "$::VCVER" "$::ARCH" ]
+    if { "$aVtkPath" != "" && [file exists "$aVtkPath/include/vtk-[wokdep:VtkVersion $aVtkPath]/vtkConfigure.h"]} { 
+      set aVtkVer [wokdep:VtkVersion $aVtkPath]
+      lappend ::CSF_OPT_INC "$aVtkPath/include/vtk-[wokdep:VtkVersion $aVtkPath]"
+    } else { # try to search in all found paths
+      set isFound "false"
+      foreach anIt $aPathList {
+        if { [file exists "$anIt/include/vtk-[wokdep:VtkVersion $anIt]/vtkConfigure.h"] } {
+          set aVtkPath $anIt
+          set aVtkVer [wokdep:VtkVersion $aVtkPath]
+          lappend ::CSF_OPT_INC "$anIt/include/vtk-[wokdep:VtkVersion $anIt]"
+          set isFound "true"
+          break
+        }
+      }
+
+      # Bad case: we do not found vtkConfigure.h in all paths.
+      if { "$isFound" == "false"} {
+        lappend anErrInc "Error: 'vtkConfigure.h' not found (VTK)"
+        set isFound "false"
+      }
+    }
+  }
+
+  set aVtkLibPath ""
+  foreach anArchIter {64 32} {
+    set aVtkLibPath [wokdep:SearchLib "vtkCommonCore-$aVtkVer" "$anArchIter"]
+    if { "$aVtkLibPath" == "" } {
+      set aPathList [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{VTK}*]
+      set aPath [wokdep:Preferred $aPathList "$::VCVER" "$anArchIter" ]
+      set aVtkLibPath [wokdep:SearchLib "vtkCommonCore-$aVtkVer" "$anArchIter" "$aPath/lib"]
+      if { "$aVtkLibPath" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+      } else {
+        set aPath [wokdep:SearchLib "vtkCommonCore-$aVtkVer" "$anArchIter" "$aVtkPath/lib"]
+        if { "$aPath" != "" } {
+          set aLibPath $aVtkIncPath
+          lappend ::CSF_OPT_LIB$anArchIter "$aLibPath/lib"
+        } else {
+          # The last chance: search /lib directory in all found paths
+          foreach anIt $aPathList {
+            set aVtkLibPath [wokdep:SearchLib "vtkCommonCore-$aVtkVer" "$anArchIter" "$anIt/lib"]
+            if { "$aVtkLibPath" != ""} {
+              lappend ::CSF_OPT_LIB$anArchIter "$anIt/lib"
+              break
+            }
+          }
+          if { "$aVtkLibPath" == "" } {
+            lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}vtkCommonCore-${aVtkVer}\.${::SYS_LIB_SUFFIX}' not found (VTK)"
+            if { "$::ARCH" == "$anArchIter" } {
+              set isFound "false"
+            }
+          }
+        }
+      }
+    }
+  }
+  
+    # Search binary path
+    if { "$::tcl_platform(platform)" == "windows" } {
+      foreach anArchIter {64 32} {
+        set aVtkBinPath [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter"]
+        if { "$aVtkBinPath" == "" } {
+          set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{VTK}*] "$::VCVER" "$anArchIter" ]
+          set aVtkBinPath [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aPath/bin"]
+          if { "$aVtkBinPath" != "" } { lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+          } else {
+            set aVtkBinPath [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aPath/lib"]
+            if { "$aVtkBinPath" != "" } { lappend ::CSF_OPT_BIN$anArchIter "$aPath/lib" } 
+          }
+        }
+      }
+      
+      # We didn't find preferred binary path => search through inc path or among all available VTK directories
+      if { "$aVtkBinPath" == "" } {
+        # Try to find in lib path
+        set aPath [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aLibPath/bin"]
+        if { "$aPath" != "" } { lappend ::CSF_OPT_BIN$anArchIter "$aLibPath/bin"
+        } elseif { [wokdep:SearchBin "vtkCommonCore-${aVtkVer}.dll" "$anArchIter" "$aLibPath/lib"] != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aLibPath/lib"
+        } else {
+           lappend anErrBin$anArchIter "Error: 'vtkCommonCore-${aVtkVer}.dll' not found (VTK)"
+           set isFound "false"
+        }
+      }
+    }
+
+  return "$isFound"
+}
+
+# Search Qt4 libraries placement
+proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qmessagebox.h"]
+  if { "$aQMsgBoxHPath" == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qmessagebox.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+      lappend ::CSF_OPT_INC "$aPath/include/Qt"
+      lappend ::CSF_OPT_INC "$aPath/include/QtGui"
+      lappend ::CSF_OPT_INC "$aPath/include/QtCore"
+    } else {
+      if { [file exists "/usr/include/qt4/QtGui/qmessagebox.h"] } {
+        lappend ::CSF_OPT_INC "/usr/include/qt4"
+        lappend ::CSF_OPT_INC "/usr/include/qt4/Qt"
+        lappend ::CSF_OPT_INC "/usr/include/qt4/QtGui"
+        lappend ::CSF_OPT_INC "/usr/include/qt4/QtCore"
+      } else {
+        lappend anErrInc "Error: 'QtGui/qmessagebox.h' not found (Qt4)"
+        set isFound "false"
+      }
+    }
+  }
+
+  set aQtGuiLibName "QtGui"
+  if { "$::tcl_platform(platform)" == "windows" } {
+    set aQtGuiLibName "QtGui4"
+  }
+
+  foreach anArchIter {64 32} {
+    set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter"]
+    if { "$aQMsgBoxLibPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
+      set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter" "$aPath/lib"]
+      if { "$aQMsgBoxLibPath" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+      } else {
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt4)"
+        if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+      }
+    }
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter"]
+      if { "$aQMsgBoxDllPath" == "" } {
+        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
+        set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter" "$aPath/bin"]
+        if { "$aQMsgBoxDllPath" != "" } {
+          lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+        } else {
+          lappend anErrBin$anArchIter "Error: 'QtGui4.dll' not found (Qt4)"
+          if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+        }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Search JDK placement
+proc wokdep:SearchJDK {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  set aJniHPath   [wokdep:SearchHeader "jni.h"]
+  set aJniMdHPath [wokdep:SearchHeader "jni_md.h"]
+  if { "$aJniHPath" == "" || "$aJniMdHPath" == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{jdk,java}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/jni.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+      if { "$::tcl_platform(platform)" == "windows" } {
+        lappend ::CSF_OPT_INC "$aPath/include/win32"
+      } elseif { [file exists "$aPath/include/linux"] } {
+        lappend ::CSF_OPT_INC "$aPath/include/linux"
+      }
+    } else {
+      if { [file exists "/System/Library/Frameworks/JavaVM.framework/Home/include/jni.h"] } {
+        lappend ::CSF_OPT_INC "/System/Library/Frameworks/JavaVM.framework/Home/include"
+      } else {
+        lappend anErrInc "Error: 'jni.h' or 'jni_md.h' not found (JDK)"
+        set isFound "false"
+      }
+    }
+  }
+
+  foreach anArchIter {64 32} {
+    set aJavacPath [wokdep:SearchBin "javac${::SYS_EXE_SUFFIX}" "$anArchIter"]
+    if { "$aJavacPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{jdk,java}*] "$::VCVER" "$anArchIter" ]
+      set aJavacPath [wokdep:SearchBin "javac${::SYS_EXE_SUFFIX}" "$anArchIter" "$aPath/bin"]
+      if { "$aJavacPath" != "" } {
+        lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+      } else {
+        if { "$::ARCH" == "$anArchIter" && [file exists "/System/Library/Frameworks/JavaVM.framework/Home/bin/javac${::SYS_EXE_SUFFIX}"] } {
+          lappend ::CSF_OPT_BIN$anArchIter "/System/Library/Frameworks/JavaVM.framework/Home/bin"
+        } else {
+          lappend anErrBin$anArchIter "Error: 'javac${::SYS_EXE_SUFFIX}' not found (JDK)"
+          if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+        }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
+# Search X11 libraries placement
+proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  if { "$::tcl_platform(platform)" == "windows" || ( "$::tcl_platform(os)" == "Darwin" && "$::MACOSX_USE_GLX" != "true" ) } {
+    return "$isFound"
+  }
+
+  set aXmuLibPath [wokdep:SearchLib "Xmu" "$::ARCH"]
+  if { "$aXmuLibPath" == "" } {
+    set aXmuLibPath [wokdep:SearchLib "Xmu" "$::ARCH" "/usr/X11/lib"]
+    if { "$aXmuLibPath" != "" } {
+      #lappend ::CSF_OPT_LIB$::ARCH "/usr/X11/lib"
+    } else {
+      lappend anErrLib$::ARCH "Error: '${::SYS_LIB_PREFIX}Xmu.${::SYS_LIB_SUFFIX}' not found (X11)"
+      set isFound "false"
+    }
+  }
+
+  return "$isFound"
+}
+
+# Generate (override) custom environment file
+proc wokdep:SaveCustom {} {
+  if { "$::tcl_platform(platform)" == "windows" } {
+    set aCustomFilePath "./custom.bat"
+    set aFile [open $aCustomFilePath "w"]
+    puts $aFile "@echo off"
+    puts $aFile "rem This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
+
+    puts $aFile ""
+    puts $aFile "set VCVER=$::VCVER"
+    puts $aFile "set ARCH=$::ARCH"
+    puts $aFile "set VCVARS=$::VCVARS"
+    puts $aFile "set SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"
+
+    puts $aFile ""
+    puts $aFile "set \"PRODUCTS_PATH=$::PRODUCTS_PATH\""
+
+    puts $aFile ""
+    puts $aFile "rem Optional 3rd-parties switches"
+    puts $aFile "set HAVE_FREEIMAGE=$::HAVE_FREEIMAGE"
+    puts $aFile "set HAVE_GL2PS=$::HAVE_GL2PS"
+    puts $aFile "set HAVE_TBB=$::HAVE_TBB"
+    puts $aFile "set HAVE_OPENCL=$::HAVE_OPENCL"
+    puts $aFile "set HAVE_VTK=$::HAVE_VTK"
+    puts $aFile "set CHECK_QT4=$::CHECK_QT4"
+    puts $aFile "set CHECK_JDK=$::CHECK_JDK"
+
+    set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "rem Additional headers search paths"
+    puts $aFile "set \"CSF_OPT_INC=$aStringInc\""
+
+    set aStringLib32 [join $::CSF_OPT_LIB32 $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "rem Additional libraries (32-bit) search paths"
+    puts $aFile "set \"CSF_OPT_LIB32=$aStringLib32\""
+
+    set aStringLib64 [join $::CSF_OPT_LIB64 $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "rem Additional libraries (64-bit) search paths"
+    puts $aFile "set \"CSF_OPT_LIB64=$aStringLib64\""
+
+    set aStringBin32 [join $::CSF_OPT_BIN32 $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "rem Additional (32-bit) search paths"
+    puts $aFile "set \"CSF_OPT_BIN32=$aStringBin32\""
+
+    set aStringBin64 [join $::CSF_OPT_BIN64 $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "rem Additional (64-bit) search paths"
+    puts $aFile "set \"CSF_OPT_BIN64=$aStringBin64\""
+
+    close $aFile
+  } else {
+    set aCustomFilePath "./custom.sh"
+    set aFile [open $aCustomFilePath "w"]
+    puts $aFile "#!/bin/bash"
+    puts $aFile "# This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
+
+    puts $aFile ""
+    puts $aFile "export ARCH=$::ARCH"
+    puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"
+
+    puts $aFile ""
+    puts $aFile "export PRODUCTS_PATH=\"$::PRODUCTS_PATH\""
+
+    puts $aFile ""
+    puts $aFile "# Optional 3rd-parties switches"
+    puts $aFile "export HAVE_FREEIMAGE=$::HAVE_FREEIMAGE"
+    puts $aFile "export HAVE_GL2PS=$::HAVE_GL2PS"
+    puts $aFile "export HAVE_TBB=$::HAVE_TBB"
+    puts $aFile "export HAVE_OPENCL=$::HAVE_OPENCL"
+    puts $aFile "export HAVE_VTK=$::HAVE_VTK"
+    if { "$::tcl_platform(os)" == "Darwin" } {
+      puts $aFile "export MACOSX_USE_GLX=$::MACOSX_USE_GLX"
+    }
+    puts $aFile "export CHECK_QT4=$::CHECK_QT4"
+    puts $aFile "export CHECK_JDK=$::CHECK_JDK"
+
+    set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "# Additional headers search paths"
+    puts $aFile "export CSF_OPT_INC=\"$aStringInc\""
+
+    set aStringLib$::ARCH [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
+    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib$::ARCH]\""
+
+    set aStringBin$::ARCH [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
+    puts $aFile ""
+    puts $aFile "# Additional ($::ARCH-bit) search paths"
+    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin$::ARCH]\""
+
+    close $aFile
+  }
+
+  puts "Configuration saved to file '$aCustomFilePath'"
+}
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
--- a/adm/templates/3rdparty_macro.cmake
+++ b/adm/templates/3rdparty_macro.cmake
@@ -1,185 +0,0 @@
-#
-
-# include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
-
-macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEBUG)
-
-  OCCT_MAKE_BUILD_POSTFIX()
-
-  # define 3RDPARTY_${PRODUCT_NAME}_DIR variable is it isn't defined
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}")
-  endif()
-
-  # search for product directory inside 3RDPARTY_DIR directory
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR AND 3RDPARTY_DIR)
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" "${PRODUCT_NAME}" ${PRODUCT_NAME}_DIR_NAME)
-    if (${PRODUCT_NAME}_DIR_NAME)
-      message (STATUS "Info: ${PRODUCT_NAME}: ${${PRODUCT_NAME}_DIR_NAME} folder is used")
-      set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
-    endif()
-  endif()
-
-  if (NOT DEFINED INSTALL_${PRODUCT_NAME})
-    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "Is ${PRODUCT_NAME} required to be copied into install directory")
-  endif()
-
-  # search for include directory
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing the headers of the ${PRODUCT_NAME}" FORCE)
-    find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS
-                                                                    "${3RDPARTY_${PRODUCT_NAME}_DIR}/include"
-                                                                    ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_HEADER}
-                                                                   NO_DEFAULT_PATH)
-    find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME})
-  endif()
-  
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing the headers of the ${PRODUCT_NAME}" FORCE)
-  endif()
-
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
-  elseif (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-    get_filename_component(3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_TMP "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-    if (NOT "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" STREQUAL "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_TMP}")
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
-    endif()
-  endif()
-
-  # search for library
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
-
-    # first of all, search for debug version of a library if build type is debug
-    if (DEFINED IS_BUILD_DEBUG)
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME_DEBUG}
-                                                     PATHS 
-                                                      "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}"
-                                                      "${3RDPARTY_${PRODUCT_NAME}_DIR}/lib"
-                                                      "${3RDPARTY_${PRODUCT_NAME}_DIR}/libd"
-                                                      ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_LIB}
-                                                     NO_DEFAULT_PATH)
-      # second search if previous one do not find anything
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME_DEBUG})
-    endif()
-
-    # if build type is release or debug version of library isn't found - search for release version of one
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
-
-      if (DEFINED IS_BUILD_DEBUG)
-        message (STATUS "Warning: debug version of ${PRODUCT_NAME} library isn't found (${LIBRARY_NAME_DEBUG}) in ${3RDPARTY_${PRODUCT_NAME}_DIR}/lib(d). Search for release one")
-      endif()
-
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME} PATHS 
-                                                                      "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}"
-                                                                      "${3RDPARTY_${PRODUCT_NAME}_DIR}/lib"
-                                                                      ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_LIB}
-                                                                     NO_DEFAULT_PATH)
-      # second search if previous one do not find anything
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME})
-    endif()
-  endif()
-  
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-  endif()
-  
-  # library path
-  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-    get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-  endif()
-  
-  # search for shared library (just for win case)
-  if (WIN32)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
-    
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
-      set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-    elseif (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-      get_filename_component(3RDPARTY_${PRODUCT_NAME}_DLL_DIR_TMP "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-      if (NOT "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" STREQUAL "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_TMP}")
-        set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-      endif()
-    endif()
-
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-      set (3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-
-      if (DEFINED IS_BUILD_DEBUG)
-        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME_DEBUG}"
-                                                   PATHS
-                                                    "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}"
-                                                    "${3RDPARTY_${PRODUCT_NAME}_DIR}/bin"
-                                                    "${3RDPARTY_${PRODUCT_NAME}_DIR}/bind"
-                                                    ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_DLL}
-                                                   NO_DEFAULT_PATH)
-        
-        # second search if previous one do not find anything
-        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME_DEBUG}")
-      endif()
-
-      if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-        set (3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-
-        if (DEFINED IS_BUILD_DEBUG)
-          message (STATUS "Warning: debug version of ${PRODUCT_NAME} dll isn't found (${LIBRARY_NAME_DEBUG}) in ${3RDPARTY_${PRODUCT_NAME}_DIR}/bin(d). Search for release one")
-        endif()
-
-        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME}" PATHS
-                                                                      "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}"
-                                                                      "${3RDPARTY_${PRODUCT_NAME}_DIR}/bin"
-                                                                      ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_DLL}
-                                                                     NO_DEFAULT_PATH)
-        
-        # second search if previous one do not find anything
-        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME}")
-      endif()
-    endif()
-    
-    if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
-      set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
-    endif()
-    
-    # shared library path
-    if (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-      get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-      set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
-    endif()
-  endif()
-  
-  if (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-  endif()
-
-  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
-  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
-  endif()
-
-  if (WIN32)
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
-    endif()
-  endif()
-
-  if (INSTALL_${PRODUCT_NAME})
-    OCCT_MAKE_OS_WITH_BITNESS()
-    OCCT_MAKE_COMPILER_SHORT_NAME()
-    OCCT_MAKE_BUILD_POSTFIX()
-
-    if (WIN32)
-      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"     DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
-    else()
-      install (FILES "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
-    endif()
-  endif()
-  
-  mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY 3RDPARTY_${PRODUCT_NAME}_DLL)
-endmacro()
--- a/adm/templates/DRAWEXE.vcxproj.user.in
+++ b/adm/templates/DRAWEXE.vcxproj.user.in
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@X_COMPILER_BITNESS@'">
+ <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
+ </LocalDebuggerEnvironment>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|@X_COMPILER_BITNESS@'">
+ <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
+ </LocalDebuggerEnvironment>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@X_COMPILER_BITNESS@'">
+ <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
+ </LocalDebuggerEnvironment>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+</Project>
--- a/adm/templates/acinclude.m4
+++ b/adm/templates/acinclude.m4
@@ -0,0 +1,157 @@
+#------------------------------------------------------------------------
+# Check for TCL
+# Options: --with-tcl=  :    Specify location of tclConfig.sh
+#          --without-tcl=  : Skip check for TCL, assume not installed
+# Defines:
+#          HAVE_TCL : yes/no
+#          Everything from tclConfig.sh
+#------------------------------------------------------------------------
+AC_DEFUN([SC_TCL_CFG], [
+  AC_ARG_WITH(tcl, 
+AC_HELP_STRING([--with-tcl=PATH],[Directory containing tclConfig.sh])
+AC_HELP_STRING([--without-tcl],  [Assume no tcl libraries available]) , 
+              [with_tcl="${withval}";require_tcl=yes],[with_tcl=yes;require_tcl=no])
+  
+  # If user requested disabling of tcl check
+  if test "xno" = "x$with_tcl"; then
+    HAVE_TCL=no
+    require_tcl=no
+  # Otherwise...
+  else
+    HAVE_TCL=no
+    # Search for tclConfig.sh
+    if test "xyes" != "x$with_tcl"; then
+      # If user specified location
+      . "${with_tcl}/tclConfig.sh" || AC_MSG_ERROR("Cannot read file: ${with_tcl}/tclConfig.sh")
+      HAVE_TCL=yes
+    else
+      # Search for tclConfig.sh in usual spots
+      tcl_cfg_file=
+      AC_MSG_CHECKING([for tclConfig.sh])
+      for i in /usr /usr/local ${prefix} /opt/sfw /usr/tcltk; do
+        if test -d $i; then
+          for j in $i/lib $i/lib/tcl $i/lib/tcl[[8-9]].[[0-9]] $i/lib/itcl; do
+            if test -r "$j/tclConfig.sh"; then
+              tcl_cfg_file="$j/tclConfig.sh"
+              break
+            fi
+          done
+        fi
+        if test "x" != "x$tcl_cfg_file"; then
+          break
+        fi
+      done
+      AC_MSG_RESULT("$tcl_cfg_file")
+      
+      if test "x" != "x$tcl_cfg_file"; then
+        . "$tcl_cfg_file" || AC_MSG_ERROR("Cannot read file: $tcl_cfg_file") 
+        HAVE_TCL=yes
+
+        # if TCL_INCLUDE_SPEC wasn't defined, try to define it using TCL_INC_DIR
+        if test "x" = "x$TCL_INCLUDE_SPEC"; then
+          inc_path=`expr "x$TCL_INC_DIR" : "x\(.*\)/tcl-private/generic"`
+          if test "x" != "$inc_path"; then
+            TCL_INCLUDE_SPEC="-I$inc_path"
+          elif test "x" != "x$TCL_INC_DIR"; then
+            TCL_INCLUDE_SPEC="-I$TCL_INC_DIR"
+          fi
+        fi
+      else
+        HAVE_TCL=no
+      fi
+    fi
+    
+    # Check for tcl.h
+    AC_LANG_C
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
+    AC_CHECK_HEADER([tcl.h],[],[HAVE_TCL=no])
+    CPPFLAGS="$save_CPPFLAGS"
+    
+    if test "xyes" = "x$require_tcl"; then
+      if test "xno" = "x$HAVE_TCL"; then
+        AC_MSG_ERROR([TCL not found.])
+      fi
+    fi
+  fi
+])
+
+
+#------------------------------------------------------------------------
+# Check for Tk
+# Options: --with-tk=  :    Specify location of Tk
+#          --without-tk=  : Skip check for Tk, assume not installed
+# Defines:
+#          HAVE_TK : yes/no
+#          Everything from tkConfig.sh
+#------------------------------------------------------------------------
+AC_DEFUN([SC_TK_CFG], [
+  AC_ARG_WITH(tk, 
+AC_HELP_STRING([--with-tk=PATH],[Directory containing tkConfig.sh])
+AC_HELP_STRING([--without-tk],  [Assume no Tk libraries available]) , 
+              [with_tk="${withval}";require_tk=yes],[with_tk=yes;require_tk=no])
+  
+  # If user requested disabling of Tk check
+  if test "xno" = "x$with_tk"; then
+    HAVE_TK=no
+    require_tk=no
+  # Otherwise...
+  else
+    HAVE_TK=no
+    # Search for tkConfig.sh
+    if test "xyes" != "x$with_tk"; then
+      # If user specified location
+      . "${with_tk}/tkConfig.sh" || AC_MSG_ERROR("Cannot read file: ${with_tk}/tkConfig.sh")
+      HAVE_TK=yes
+    else
+      # Search for tkConfig.sh in usual spots
+      tk_cfg_file=
+      AC_MSG_CHECKING([for tkConfig.sh])
+      for i in /usr /usr/local ${prefix} /opt/sfw /usr/tcltk; do
+        if test -d $i; then
+          for j in $i/lib $i/lib/tk $i/lib/tk[[8-9]].[[0-9]] $i/lib/itcl; do
+            if test -r "$j/tkConfig.sh"; then
+              tk_cfg_file="$j/tkConfig.sh"
+              break
+            fi
+          done
+        fi
+        if test "x" != "x$tk_cfg_file"; then
+          break
+        fi
+      done
+      AC_MSG_RESULT("$tk_cfg_file")
+      
+      if test "x" != "x$tk_cfg_file"; then
+        . "$tk_cfg_file" || AC_MSG_ERROR("Cannot read file: $tk_cfg_file") 
+        HAVE_TK=yes
+
+        # if TK_INCLUDE_SPEC wasn't defined, try to define it using TK_INC_DIR
+        if test "x" = "x$TK_INCLUDE_SPEC"; then
+          inc_path=`expr "x$TK_INC_DIR" : "x\(.*\)/tk-private/generic"`
+          if test "x" != "$inc_path"; then
+            TK_INCLUDE_SPEC="-I$inc_path"
+          elif test "x" != "x$TK_INC_DIR"; then
+            TK_INCLUDE_SPEC="-I$TK_INC_DIR"
+          fi
+        fi
+      else
+        HAVE_TK=no
+      fi
+    fi
+    
+    # Check for tk.h
+    AC_LANG_C
+    HAVE_TK=yes
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC $TK_INCLUDE_SPEC"
+    AC_CHECK_HEADER([tk.h],[],[HAVE_TK=no])
+    CPPFLAGS="$save_CPPFLAGS"
+    
+    if test "xyes" = "x$require_tk"; then
+      if test "xno" = "x$HAVE_TK"; then
+        AC_MSG_ERROR([Tk not found.])
+      fi
+    fi
+  fi
+])
--- a/adm/templates/codeblocks.sh
+++ b/adm/templates/codeblocks.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export TARGET="cbp"
+
+source ./env.sh "$1" "$TARGET"
+
+if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then
+  /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/OCCT.workspace
+else
+  codeblocks ./adm/$WOKSTATION/cbp/OCCT.workspace
+fi
--- a/adm/templates/custom.bat.in
+++ b/adm/templates/custom.bat.in
@@ -2,14 +2,14 @@ echo off

 if "%VCVER%" == "@COMPILER@" (
  if "%ARCH%" == "@COMPILER_BITNESS@" (
-    if "%CASDEB%" == "@BUILD_POSTFIX@" (
-      set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@"
-      set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@"
-      set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIR@"
-      set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIR@"
-      set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
-	  set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
-    )
+    set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@"
+    set "FREETYPE_DIR=@USED_3RDPARTY_FREETYPE_DIR@"
+    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIR@"
+    set "FREEIMAGEPLUS_DIR=@USED_3RDPARTY_FREEIMAGEPLUS_DIR@"
+    set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIR@"
+    set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
+    set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
+    set "CSF_TestDataPath=@TESTS_SHAPES_DIR@"
  ) 
 )

--- a/adm/templates/custom.sh.in
+++ b/adm/templates/custom.sh.in
@@ -2,14 +2,13 @@

 if [ "$COMPILER" == "@COMPILER@" ]; then
  if [ "$ARCH" == "@COMPILER_BITNESS@" ]; then
-    if [ "$CASDEB" == "@BUILD_POSTFIX@" ]; then
-      export TCL_DIR="@3RDPARTY_TCL_LIBRARY_DIR@"
-      export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
-      export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIR@"
-      export GL2PS_DIR="@3RDPARTY_GL2PS_LIBRARY_DIR@"
-      export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
-	  export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
-    fi
+    export TCL_DIR="@USED_3RDPARTY_TCL_DIR@"
+    export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
+    export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIR@"
+    export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIR@"
+    export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
+    export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
+    export CSF_TestDataPath="@TESTS_SHAPES_DIR@"
  fi
 fi

--- a/adm/templates/draw.bat
+++ b/adm/templates/draw.bat
@@ -4,7 +4,4 @@ rem Setup environment and launch DRAWEXE
 call "%~dp0env.bat" %1 %2 %3

 echo Hint: use "pload ALL" command to load standard commands
-"%CASROOT%/%BIN_TAIL%/DRAWEXE.exe"
-
-set "PATH=%ORIGIN_PATH%"
-
+DRAWEXE.exe
--- a/adm/templates/draw.sh
+++ b/adm/templates/draw.sh
@@ -2,7 +2,7 @@

 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";

-source "${aScriptPath}/env.sh" "$1"
+source "${aScriptPath}/env.sh" "$1" "$2"

 echo 'Hint: use "pload ALL" command to load standard commands'
 DRAWEXE
--- a/adm/templates/env.bat
+++ b/adm/templates/env.bat
@@ -0,0 +1,155 @@
+@echo off
+
+rem Use:
+rem - first argument specifies version of Visual Studio (vc8, vc9, or vc10),
+rem - second argument specifies architecture (win32 or win64),
+rem - third argument specifies build mode (Debug or Release)
+rem Default options are:
+rem   vc8 win32 Release
+
+set "SCRIPTROOT=%~dp0"
+set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
+set "CASROOT=__CASROOT__"
+if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
+if     ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
+
+rem ----- Reset values to defaults -----
+set "CASDEB="
+set "VCVER=vc8"
+set "ARCH=32"
+set "VCVARS="
+set "HAVE_TBB=false"
+set "HAVE_OPENCL=false"
+set "HAVE_FREEIMAGE=false"
+set "HAVE_GL2PS=false"
+set "HAVE_OPENCL=false"
+set "HAVE_VTK=false"
+set "CSF_OPT_INC="
+set "CSF_OPT_LIB32="
+set "CSF_OPT_LIB64="
+set "CSF_OPT_BIN32="
+set "CSF_OPT_BIN64="
+
+rem ----- Load local settings -----
+if exist "%~dp0custom.bat" (
+  call "%~dp0custom.bat" %1 %2 %3 %4 %5
+)
+
+rem ----- Read script arguments (override local settings) -----
+if not ["%1"]    == [""]      set "VCVER=%1"
+if not ["%2"]    == [""]      set "ARCH=%2"
+if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
+if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
+if /I ["%3"]     == ["debug"] set "CASDEB=d"
+if /I ["%3"]     == ["d"]     set "CASDEB=d"
+
+set "CSF_OPT_INC=%CSF_OPT_INC%;%CASROOT%\inc"
+set "CSF_OPT_LIB32D=%CSF_OPT_LIB32%;%CASROOT%\win32\%VCVER%\libd"
+set "CSF_OPT_LIB64D=%CSF_OPT_LIB64%;%CASROOT%\win64\%VCVER%\libd"
+set "CSF_OPT_BIN32D=%CSF_OPT_BIN32%;%CASROOT%\win32\%VCVER%\bind"
+set "CSF_OPT_BIN64D=%CSF_OPT_BIN64%;%CASROOT%\win64\%VCVER%\bind"
+set "CSF_OPT_LIB32=%CSF_OPT_LIB32%;%CASROOT%\win32\%VCVER%\lib"
+set "CSF_OPT_LIB64=%CSF_OPT_LIB64%;%CASROOT%\win64\%VCVER%\lib"
+set "CSF_OPT_BIN32=%CSF_OPT_BIN32%;%CASROOT%\win32\%VCVER%\bin"
+set "CSF_OPT_BIN64=%CSF_OPT_BIN64%;%CASROOT%\win64\%VCVER%\bin"
+
+rem ----- Optional 3rd-parties should be enabled by HAVE macros -----
+set "CSF_OPT_CMPL="
+set "PRODUCTS_DEFINES="
+if ["%HAVE_TBB%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_TBB"
+if ["%HAVE_OPENCL%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENCL"
+if ["%HAVE_GL2PS%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_GL2PS"
+if ["%HAVE_FREEIMAGE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE"
+if ["%HAVE_VTK%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_VTK"
+if ["%HAVE_TBB%"]       == ["true"] set "CSF_DEFINES=HAVE_TBB;%CSF_DEFINES%"
+if ["%HAVE_OPENCL%"]    == ["true"] set "CSF_DEFINES=HAVE_OPENCL;%CSF_DEFINES%"
+if ["%HAVE_GL2PS%"]     == ["true"] set "CSF_DEFINES=HAVE_GL2PS;%CSF_DEFINES%"
+if ["%HAVE_FREEIMAGE%"] == ["true"] set "CSF_DEFINES=HAVE_FREEIMAGE;%CSF_DEFINES%"
+if ["%HAVE_VTK%"]       == ["true"] set "CSF_DEFINES=HAVE_VTK;%CSF_DEFINES%"
+
+rem Eliminate VS warning
+if ["%CSF_DEFINES%"]  == [""] set "CSF_DEFINES=;"
+
+rem ----- Optional 3rd-parties should be enabled by HAVE macros -----
+if not ["%PRODUCTS_DEFINES%"] == [""] set "CSF_OPT_CMPL=%CSF_OPT_CMPL% %PRODUCTS_DEFINES%"
+
+rem ----- Colect 3rd-parties additional include paths into compiler options -----
+for %%a in ("%CSF_OPT_INC:;=";"%") do (
+  set "anItem=%%~a"
+  if not ["%%~a"] == [""] call :concatCmplInc %%~a
+)
+
+rem ----- Colect 3rd-parties additional library paths (32-bit) into linker options -----
+set "OPT_LIB32="
+for %%a in ("%CSF_OPT_LIB32:;=";"%") do (
+  set "anItem=%%~a"
+  if not ["%%~a"] == [""] call :concatLib32 %%~a
+)
+
+rem ----- Colect 3rd-parties additional library paths (64-bit) into linker options -----
+set "OPT_LIB64="
+for %%a in ("%CSF_OPT_LIB64:;=";"%") do (
+  set "anItem=%%~a"
+  if not ["%%~a"] == [""] call :concatLib64 %%~a
+)
+
+set "CSF_OPT_LNK32="
+set "CSF_OPT_LNK64="
+set "CSF_OPT_LNK32D="
+set "CSF_OPT_LNK64D="
+set "CSF_OPT_LNK32=%CSF_OPT_LNK32% %OPT_LIB32%"
+set "CSF_OPT_LNK32D=%CSF_OPT_LNK32D% %OPT_LIB32%"
+set "CSF_OPT_LNK64=%CSF_OPT_LNK64% %OPT_LIB64%"
+set "CSF_OPT_LNK64D=%CSF_OPT_LNK64D% %OPT_LIB64%"
+
+set "CASBIN=win%ARCH%\%VCVER%"
+
+rem ----- Set path to 3rd party and OCCT libraries -----
+set "PATH=%SCRIPTROOT%\%CASBIN%\bin%CASDEB%;%PATH%"
+if     ["%CASDEB%"] == [""] if ["%ARCH%"] == ["32"] set "PATH=%CSF_OPT_BIN32%;%PATH%"
+if     ["%CASDEB%"] == [""] if ["%ARCH%"] == ["64"] set "PATH=%CSF_OPT_BIN64%;%PATH%"
+if not ["%CASDEB%"] == [""] if ["%ARCH%"] == ["32"] set "PATH=%CSF_OPT_BIN32D%;%PATH%"
+if not ["%CASDEB%"] == [""] if ["%ARCH%"] == ["64"] set "PATH=%CSF_OPT_BIN64D%;%PATH%"
+
+rem ----- Set envoronment variables used by OCCT -----
+set CSF_LANGUAGE=us
+set MMGT_CLEAR=1
+set CSF_EXCEPTION_PROMPT=1
+set "CSF_SHMessage=%CASROOT%\src\SHMessage"
+set "CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures"
+set "CSF_ShadersDirectory=%CASROOT%\src\Shaders"
+set "CSF_XSMessage=%CASROOT%\src\XSMessage"
+set "CSF_TObjMessage=%CASROOT%\src\TObj"
+set "CSF_StandardDefaults=%CASROOT%\src\StdResource"
+set "CSF_PluginDefaults=%CASROOT%\src\StdResource"
+set "CSF_XCAFDefaults=%CASROOT%\src\StdResource"
+set "CSF_TObjDefaults=%CASROOT%\src\StdResource"
+set "CSF_StandardLiteDefaults=%CASROOT%\src\StdResource"
+set "CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat"
+set "CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat"
+set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
+set "CSF_STEPDefaults=%CASROOT%\src\XSTEPResource"
+set "CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource"
+set "CSF_MIGRATION_TYPES=%CASROOT%\src\StdResource\MigrationSheet.txt"
+
+rem Draw Harness special stuff
+if exist "%CASROOT%\src\DrawResources" (
+  set "DRAWHOME=%CASROOT%\src\DrawResources"
+  set "CSF_DrawPluginDefaults=%DRAWHOME%"
+)
+if exist "%SCRIPTROOT%\src\DrawResourcesProducts" (
+  set "CSF_DrawPluginProductsDefaults=%SCRIPTROOT%\src\DrawResourcesProducts"
+)
+goto :eof
+
+:concatCmplInc
+set "CSF_OPT_CMPL=%CSF_OPT_CMPL% -I%1"
+goto :eof
+
+:concatLib32
+set "OPT_LIB32=%OPT_LIB32% /LIBPATH:%1"
+goto :eof
+
+:concatLib64
+set "OPT_LIB64=%OPT_LIB64% /LIBPATH:%1"
+goto :eof
--- a/adm/templates/env.bat.in
+++ b/adm/templates/env.bat.in
@@ -5,7 +5,7 @@ set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"

 set "VCVER=@COMPILER@"
 set "ARCH=@COMPILER_BITNESS@"
-set "CASDEB=@BUILD_POSTFIX@"
+set "CASDEB="

 if not ["%1"]    == [""]      set "VCVER=%1"
 if not ["%2"]    == [""]      set "ARCH=%2"
@@ -15,19 +15,20 @@ if /I ["%3"]     == ["debug"] set "CASDEB=d"
 if /I ["%3"]     == ["d"]     set "CASDEB=d"

 if exist "%~dp0custom.bat" (
-  call "%~dp0custom.bat" %1 %2 %3
+  call "%~dp0custom.bat" %VCVER% %ARCH% %CASDEB%
 )

 if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"

 set "ORIGIN_PATH=%PATH%"

-if not ["%TCL_DIR%"] == [""]       set "PATH=%TCL_DIR%;%PATH%"
-if not ["%FREETYPE_DIR%"] == [""]  set "PATH=%FREETYPE_DIR%;%PATH%"
-if not ["%FREEIMAGE_DIR%"] == [""] set "PATH=%FREEIMAGE_DIR%;%PATH%"
-if not ["%GL2PS_DIR%"] == [""]     set "PATH=%GL2PS_DIR%;%PATH%"
-if not ["%TBB_DIR%"] == [""]       set "PATH=%TBB_DIR%;%PATH%"
-if not ["%VTK_DIR%"] == [""]       set "PATH=%VTK_DIR%;%PATH%"
+if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
+if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
+if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
+if not ["%FREEIMAGEPLUS_DIR%"] == [""] set "PATH=%FREEIMAGEPLUS_DIR%;%PATH%"
+if not ["%GL2PS_DIR%"] == [""]         set "PATH=%GL2PS_DIR%;%PATH%"
+if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
+if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"

 rem ----- Set path to 3rd party and OCCT libraries -----
 set "BIN_TAIL=win%ARCH%/%VCVER%/bin%CASDEB%"
--- a/adm/templates/env.build.bat.in
+++ b/adm/templates/env.build.bat.in
@@ -0,0 +1,73 @@
+echo off
+
+set "SCRIPTROOT=%~dp0"
+set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
+
+set "CASROOT=@CMAKE_SOURCE_DIR@"
+
+set "VCVER=@COMPILER@"
+set "ARCH=@COMPILER_BITNESS@"
+set "CASDEB="
+
+if not ["%1"]    == [""]      set "VCVER=%1"
+if not ["%2"]    == [""]      set "ARCH=%2"
+if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
+if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
+if /I ["%3"]     == ["debug"] set "CASDEB=d"
+if /I ["%3"]     == ["d"]     set "CASDEB=d"
+
+if exist "%~dp0custom.bat" (
+  call "%~dp0custom.bat" %1 %2 %3
+)
+
+if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
+
+set "ORIGIN_PATH=%PATH%"
+
+if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
+if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
+if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
+if not ["%FREEIMAGEPLUS_DIR%"] == [""] set "PATH=%FREEIMAGEPLUS_DIR%;%PATH%"
+if not ["%GL2PS_DIR%"] == [""]         set "PATH=%GL2PS_DIR%;%PATH%"
+if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
+if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
+
+rem ----- Set path to 3rd party and OCCT libraries -----
+set "BIN_TAIL=win%ARCH%/%VCVER%/bin%CASDEB%"
+set "PATH=@CMAKE_BINARY_DIR@/%BIN_TAIL%;%PATH%"
+
+rem ----- Set envoronment variables used by OCCT -----
+set  CSF_LANGUAGE=us
+set  MMGT_CLEAR=1
+set  CSF_EXCEPTION_PROMPT=1
+set "CSF_SHMessage=%CASROOT%\src\SHMessage"
+set "CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures"
+set "CSF_ShadersDirectory=%CASROOT%\src\Shaders"
+set "CSF_XSMessage=%CASROOT%\src\XSMessage"
+set "CSF_TObjMessage=%CASROOT%\src\TObj"
+set "CSF_StandardDefaults=%CASROOT%\src\StdResource"
+set "CSF_PluginDefaults=%CASROOT%\src\StdResource"
+set "CSF_XCAFDefaults=%CASROOT%\src\StdResource"
+set "CSF_TObjDefaults=%CASROOT%\src\StdResource"
+set "CSF_StandardLiteDefaults=%CASROOT%\src\StdResource"
+set "CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat"
+set "CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat"
+set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
+set "CSF_STEPDefaults=%CASROOT%\src\XSTEPResource"
+set "CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource"
+set "CSF_MIGRATION_TYPES=%CASROOT%\src\StdResource\MigrationSheet.txt"
+
+rem Draw Harness special stuff
+if exist "%CASROOT%\src\DrawResources" (
+  set "DRAWHOME=%CASROOT%\src\DrawResources"
+  set "CSF_DrawPluginDefaults=%CASROOT%\src\DrawResources"
+
+  if exist "%CASROOT%\src\DrawResources\DrawDefault" (
+    set "DRAWDEFAULT=%CASROOT%\src\DrawResources\DrawDefault"
+  )
+)
+
+if exist "%CASROOT%\src\DrawResourcesProducts" (
+  set "CSF_DrawPluginProductsDefaults=%CASROOT%\src\DrawResourcesProducts"
+)
+
--- a/adm/templates/env.build.sh.in
+++ b/adm/templates/env.build.sh.in
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+
+export CASROOT="@CMAKE_SOURCE_DIR@"
+
+if [ "${CASROOT}" == "" ]; then
+  export CASROOT="${aScriptPath}"
+fi
+
+# Read script arguments
+shopt -s nocasematch
+export CASDEB="";
+if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
+shopt -u nocasematch
+
+export COMPILER="@COMPILER@"
+
+# ----- Set path to 3rd party and OCCT libraries -----
+anArch=`uname -m`
+if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
+  export ARCH="32";
+else
+  export ARCH="64";
+fi
+
+aSystem=`uname -s`
+if [ "$aSystem" == "Darwin" ]; then
+  export WOKSTATION="mac";
+  export ARCH="64";
+else
+  export WOKSTATION="lin";
+fi
+
+# ----- Set local settings -----
+if [ -e "${aScriptPath}/custom.sh" ]; then
+  source "${aScriptPath}/custom.sh" "${COMPILER}" "${WOKSTATION}${ARCH}" "${CASDEB}"
+fi
+
+THRDPARTY_PATH=""
+if [ "$TCL_DIR" != "" ]; then
+  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$FREETYPE_DIR" != "" ]; then
+  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$FREEIMAGE_DIR" != "" ]; then
+  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$GL2PS_DIR" != "" ]; then
+  THRDPARTY_PATH="${GL2PS_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$TBB_DIR" != "" ]; then
+  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$VTK_DIR" != "" ]; then
+  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
+fi
+
+BIN_PATH="${WOKSTATION}${ARCH}/${COMPILER}/bin${CASDEB}"
+LIBS_PATH="${WOKSTATION}${ARCH}/${COMPILER}/lib${CASDEB}"
+
+export PATH="@CMAKE_BINARY_DIR@/${BIN_PATH}:${PATH}"
+
+if [ "$LD_LIBRARY_PATH" != "" ]; then
+  export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/${LIBS_PATH}:${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
+else
+  export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/${LIBS_PATH}:${THRDPARTY_PATH}"
+fi
+
+if [ "$WOKSTATION" == "mac" ]; then
+  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
+  else
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
+  fi
+fi
+
+# ----- Set envoronment variables used by OCCT -----
+export CSF_LANGUAGE=us
+export MMGT_CLEAR=1
+export CSF_EXCEPTION_PROMPT=1
+export CSF_SHMessage="${CASROOT}/src/SHMessage"
+export CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
+export CSF_ShadersDirectory="${CASROOT}/src/Shaders"
+export CSF_XSMessage="${CASROOT}/src/XSMessage"
+export CSF_TObjMessage="${CASROOT}/src/TObj"
+export CSF_StandardDefaults="${CASROOT}/src/StdResource"
+export CSF_PluginDefaults="${CASROOT}/src/StdResource"
+export CSF_XCAFDefaults="${CASROOT}/src/StdResource"
+export CSF_TObjDefaults="${CASROOT}/src/StdResource"
+export CSF_StandardLiteDefaults="${CASROOT}/src/StdResource"
+export CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
+export CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
+export CSF_IGESDefaults="${CASROOT}/src/XSTEPResource"
+export CSF_STEPDefaults="${CASROOT}/src/XSTEPResource"
+export CSF_XmlOcafResource="${CASROOT}/src/XmlOcafResource"
+export CSF_MIGRATION_TYPES="${CASROOT}/src/StdResource/MigrationSheet.txt"
+
+# Draw Harness special stuff
+if [ -e "${CASROOT}/src/DrawResources" ]; then
+  export DRAWHOME="${CASROOT}/src/DrawResources"
+  export CSF_DrawPluginDefaults="${CASROOT}/src/DrawResources"
+
+  if [ -e "${CASROOT}/src/DrawResources/DrawDefault" ]; then
+    export DRAWDEFAULT="${CASROOT}/src/DrawResources/DrawDefault"
+  fi
+fi
+
+if [ -e "${CASROOT}/src/DrawResourcesProducts" ]; then
+  export CSF_DrawPluginProductsDefaults="${CASROOT}/src/DrawResourcesProducts"
+fi
+
--- a/adm/templates/env.sh
+++ b/adm/templates/env.sh
@@ -0,0 +1,202 @@
+#!/bin/bash
+
+# go to the script directory
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+
+export CASROOT="__CASROOT__"
+
+if [ "${CASROOT}" != "" ] && [ -d "${aScriptPath}/${CASROOT}" ]; then
+  export CASROOT="${aScriptPath}/${CASROOT}"
+fi
+if [ "${CASROOT}" == "" ]; then
+  export CASROOT="${aScriptPath}"
+fi
+
+# Reset values
+export CASDEB=""
+export TARGET="";
+export HAVE_TBB="false";
+export HAVE_OPENCL="false";
+export HAVE_FREEIMAGE="false";
+export HAVE_GL2PS="false";
+export HAVE_VTK="false";
+export MACOSX_USE_GLX="false";
+export CSF_OPT_INC=""
+export CSF_OPT_LIB32=""
+export CSF_OPT_LIB64=""
+export CSF_OPT_BIN32=""
+export CSF_OPT_BIN64=""
+
+# ----- Set local settings -----
+if [ -e "${aScriptPath}/custom.sh" ]; then source "${aScriptPath}/custom.sh"; fi
+
+# Read script arguments
+shopt -s nocasematch
+for i in $*
+do
+  if [ "$i" == "d" ] || [ "$i" == "debug" ]; then
+    export CASDEB="d"
+  elif [ "$i" == "cbp" ]; then
+    export TARGET="cbp";
+  elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
+    export TARGET="xcd";
+  fi
+done
+shopt -u nocasematch
+
+# ----- Setup Environment Variables -----
+anArch=`uname -m`
+if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
+  export ARCH="32";
+else
+  export ARCH="64";
+fi
+
+aSystem=`uname -s`
+if [ "$aSystem" == "Darwin" ]; then
+  export WOKSTATION="mac";
+  export ARCH="64";
+else
+  export WOKSTATION="lin";
+fi
+
+export CASBIN=""
+if [ "${TARGET}" == "cbp" ]; then
+  export CASBIN="${WOKSTATION}/cbp"
+elif [ "${TARGET}" == "xcd" ]; then
+  export CASBIN="adm/mac/xcd/build"
+fi
+
+export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"
+
+if [ "${TARGET}" == "cbp" ]; then
+  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
+  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
+elif [ "${TARGET}" == "xcd" ]; then
+  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
+  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
+fi
+
+export CSF_OPT_CMPL=""
+
+# Optiona 3rd-parties should be enabled by HAVE macros
+if [ "$HAVE_TBB" == "true" ]; then
+  export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_TBB"
+fi
+if [ "$HAVE_OPENCL" == "true" ]; then
+  export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENCL"
+fi
+if [ "$HAVE_FREEIMAGE" == "true" ]; then
+  export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FREEIMAGE"
+fi
+if [ "$HAVE_GL2PS" == "true" ]; then
+  export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GL2PS"
+fi
+if [ "$HAVE_VTK" == "true" ]; then
+  export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_VTK"
+fi
+# Option to compile OCCT with X11 libs on Mac OS X
+if [ "$MACOSX_USE_GLX" == "true" ]; then
+  export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DMACOSX_USE_GLX"
+fi
+
+# To split string into array
+aDelimBack=$IFS
+IFS=":"
+
+# 3rd-parties additional include paths
+set -- "$CSF_OPT_INC"
+declare -a aPartiesIncs=($*)
+for anItem in ${aPartiesIncs[*]}
+do
+  export CSF_OPT_CMPL="${CSF_OPT_CMPL} -I${anItem}";
+done
+
+# Append 3rd-parties to LD_LIBRARY_PATH
+if [ "$ARCH" == "32" ]; then
+  set -- "$CSF_OPT_LIB32"
+  declare -a aPartiesLibs=($*)
+  set -- "$CSF_OPT_LIB32D"
+  declare -a aPartiesLibsDeb=($*)
+else
+  set -- "$CSF_OPT_LIB64"
+  declare -a aPartiesLibs=($*)
+  set -- "$CSF_OPT_LIB64D"
+  declare -a aPartiesLibsDeb=($*)
+fi
+
+# Turn back value
+IFS=$aDelimBack
+
+OPT_LINKER_OPTIONS_DEB=""
+for anItem in ${aPartiesLibsDeb[*]}
+do
+  OPT_LINKER_OPTIONS_DEB="${OPT_LINKER_OPTIONS_DEB} -L${anItem}"
+done
+
+OPT_LINKER_OPTIONS=""
+for anItem in ${aPartiesLibs[*]}
+do
+  if [ "${LD_LIBRARY_PATH}" == "" ]; then
+    export LD_LIBRARY_PATH="${anItem}"
+  else
+    export LD_LIBRARY_PATH="${anItem}:${LD_LIBRARY_PATH}"
+  fi
+  OPT_LINKER_OPTIONS="${OPT_LINKER_OPTIONS} -L${anItem}"
+done
+
+if [ "$ARCH" == "64" ]; then
+  export CSF_OPT_LNK64="$OPT_LINKER_OPTIONS"
+  export CSF_OPT_LNK64D="$OPT_LINKER_OPTIONS_DEB"
+else
+  export CSF_OPT_LNK32="$OPT_LINKER_OPTIONS"
+  export CSF_OPT_LNK32D="$OPT_LINKER_OPTIONS_DEB"
+fi
+
+
+BIN_PATH="${CASBIN}/bin${CASDEB}"
+LIBS_PATH="${CASBIN}/lib${CASDEB}"
+if [ "${TARGET}" == "xcd" ]; then
+  [[ "${CASDEB}" == "d" ]] && BIN_PATH="${CASBIN}/Debug" || BIN_PATH="${CASBIN}/Release"
+  LIBS_PATH="$BIN_PATH"
+fi
+
+export PATH="${CASROOT}/${BIN_PATH}:${PATH}"
+export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${LD_LIBRARY_PATH}"
+if [ "$WOKSTATION" == "mac" ]; then
+  export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
+fi
+
+# Set envoronment variables used by OCCT
+export CSF_LANGUAGE="us"
+export MMGT_CLEAR="1"
+export CSF_EXCEPTION_PROMPT="1"
+export CSF_SHMessage="${CASROOT}/src/SHMessage"
+export CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
+export CSF_ShadersDirectory="${CASROOT}/src/Shaders"
+export CSF_XSMessage="${CASROOT}/src/XSMessage"
+export CSF_TObjMessage="${CASROOT}/src/TObj"
+export CSF_StandardDefaults="${CASROOT}/src/StdResource"
+export CSF_PluginDefaults="${CASROOT}/src/StdResource"
+export CSF_XCAFDefaults="${CASROOT}/src/StdResource"
+export CSF_TObjDefaults="${CASROOT}/src/StdResource"
+export CSF_StandardLiteDefaults="${CASROOT}/src/StdResource"
+export CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
+export CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
+export CSF_IGESDefaults="${CASROOT}/src/XSTEPResource"
+export CSF_STEPDefaults="${CASROOT}/src/XSTEPResource"
+export CSF_XmlOcafResource="${CASROOT}/src/XmlOcafResource"
+export CSF_MIGRATION_TYPES="${CASROOT}/src/StdResource/MigrationSheet.txt"
+
+# Draw Harness special stuff
+if [ -e "${CASROOT}/src/DrawResources" ]; then
+  export DRAWHOME="${CASROOT}/src/DrawResources"
+  export CSF_DrawPluginDefaults="${DRAWHOME}"
+fi
+if [ -e "${aScriptPath}/src/DrawResourcesProducts" ]; then
+  export CSF_DrawPluginProductsDefaults="${aScriptPath}/src/DrawResourcesProducts"
+fi
--- a/adm/templates/env.sh.in
+++ b/adm/templates/env.sh.in
@@ -8,7 +8,7 @@ fi

 # Read script arguments
 shopt -s nocasematch
-export CASDEB="@BUILD_POSTFIX@";
+export CASDEB="";
 if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
 if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
 shopt -u nocasematch
--- a/adm/templates/header.in
+++ b/adm/templates/header.in
@@ -0,0 +1 @@
+#include "@OCCT_HEADER_FILE@"
--- a/adm/templates/msvc.bat
+++ b/adm/templates/msvc.bat
@@ -0,0 +1,42 @@
+@echo off
+
+rem Setup environment
+call "%~dp0env.bat" %1 %2 %3
+
+rem Define path to project file
+set "PRJFILE=%~dp0\adm\msvc\%VCVER%\OCCT.sln"
+if not exist "%PRJFILE%" set "PRJFILE=%~dp0\adm\msvc\%VCVER%\Products.sln"
+if not "%4" == "" (
+  set "PRJFILE=%4"
+)
+
+set "VisualStudioExpressName=VCExpress"
+
+if "%VCVER%" == "vc8" (
+  set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
+) else if "%VCVER%" == "vc9" (
+  set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
+) else if "%VCVER%" == "vc10" (
+  set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
+) else if "%VCVER%" == "vc11" (
+  set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
+  rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
+  rem and has a new name for executable - WDExpress
+  set "VisualStudioExpressName=WDExpress"
+) else if "%VCVER%" == "vc12" (
+  set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
+  set "VisualStudioExpressName=WDExpress"
+) else (
+  echo Error: wrong VS identifier
+  exit /B
+)
+
+rem Launch Visual Studio - either professional (devenv) or Express, as available
+if exist "%DevEnvDir%\devenv.exe"  (
+  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
+  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+) else (
+  echo Error: Could not find MS Visual Studio ^(%VCVER%^)
+  echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
+)
--- a/adm/templates/occt_macros.cmake
+++ b/adm/templates/occt_macros.cmake
@@ -1,201 +0,0 @@
-#
-
-macro (OCCT_CHECK_AND_UNSET VARNAME)
-  if (DEFINED ${VARNAME})
-    unset (${VARNAME} CACHE)
-  endif()
-endmacro()
-
-macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_DIR")
-
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
-
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
-
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
-endmacro()
-
-# BUILD_POSTFIX, IS_BUILD_DEBUG variables
-macro (OCCT_MAKE_BUILD_POSTFIX)
-  if ("${BUILD_CONFIGURATION}" STREQUAL "Debug")
-    set (BUILD_POSTFIX "d")
-    set (IS_BUILD_DEBUG "")
-  else()
-    set (BUILD_POSTFIX "")
-    OCCT_CHECK_AND_UNSET (IS_BUILD_DEBUG)
-  endif()
-endmacro()
-
-# COMPILER_BITNESS variable
-macro (OCCT_MAKE_COMPILER_BITNESS)
-  math (EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
-endmacro()
-
-# OS_WITH_BIT
-macro (OCCT_MAKE_OS_WITH_BITNESS)
-
-  OCCT_MAKE_COMPILER_BITNESS()
-
-  if (WIN32)
-    set (OS_WITH_BIT "win${COMPILER_BITNESS}")
-  elseif(APPLE)
-    set (OS_WITH_BIT "mac${COMPILER_BITNESS}")
-  else()
-    set (OS_WITH_BIT "lin${COMPILER_BITNESS}")
-  endif()
-endmacro()
-
-# COMPILER variable
-macro (OCCT_MAKE_COMPILER_SHORT_NAME)
-  if (MSVC)
-    if (MSVC70)
-      set (COMPILER vc7)
-    elseif (MSVC80)
-      set (COMPILER vc8)
-    elseif (MSVC90)
-      set (COMPILER vc9)
-    elseif (MSVC10)
-      set (COMPILER vc10)
-    elseif (MSVC11)
-      set (COMPILER vc11)
-    elseif (MSVC12)
-      set (COMPILER vc12)
-    endif()
-  elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
-    set (COMPILER gcc)
-  elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-    set (COMPILER gxx)
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    set (COMPILER clang)
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-    set (COMPILER icc)
-  else()
-    set (COMPILER ${CMAKE_GENERATOR})
-    string (REGEX REPLACE " " "" COMPILER ${COMPILER})
-  endif()
-endmacro()
-
-function (SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
-  file (GLOB SUB_ITEMS "${MAIN_DIRECTORY}/*")
-
-  foreach (ITEM ${SUB_ITEMS})
-    if (IS_DIRECTORY "${ITEM}")
-      get_filename_component (ITEM_NAME "${ITEM}" NAME)
-      list (APPEND LOCAL_RESULT "${ITEM_NAME}")
-    endif()
-  endforeach()
-  set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
-endfunction()
-
-function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
-  OCCT_MAKE_COMPILER_SHORT_NAME()
-  OCCT_MAKE_COMPILER_BITNESS()
-
-  string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
-
-  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+")
-  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}")
-
-  SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)
-
-  foreach (SEARCH_TEMPLATE ${SEARCH_TEMPLATES})
-    if (LOCAL_RESULT)
-      BREAK()
-    endif()
-
-    foreach (SUBDIR_NAME ${SUBDIR_NAME_LIST})
-      string (TOLOWER "${SUBDIR_NAME}" lower_SUBDIR_NAME)
-
-      string (REGEX MATCH "${SEARCH_TEMPLATE}" DUMMY_VAR "${lower_SUBDIR_NAME}")
-      if (DUMMY_VAR)
-        list (APPEND LOCAL_RESULT ${SUBDIR_NAME})
-      endif()
-    endforeach()
-  endforeach()
-
-  if (LOCAL_RESULT)
-    list (LENGTH "${LOCAL_RESULT}" LOC_LEN)
-    math (EXPR LAST_ELEMENT_INDEX "${LOC_LEN}-1")
-    list (GET LOCAL_RESULT ${LAST_ELEMENT_INDEX} DUMMY)
-    set (${RESULT} ${DUMMY} PARENT_SCOPE)
-  endif()
-endfunction()
-
-macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH)
-  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
-    if (IS_DIRECTORY "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
-      # first of all, install original files
-      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-
-      # secondly, rewrite original files with patched ones
-      install (DIRECTORY "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    else()
-      install (FILES     "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    endif()
-  else()
-    if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}")
-      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    else()
-      install (FILES     "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
-    endif()
-  endif()
-endmacro()
-
-macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE FINAL_NAME DESTINATION_PATH)
-  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}")
-    configure_file("${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
-  else()
-    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
-  endif()
-
-  install(FILES "${OCCT_BINARY_DIR}/${FINAL_NAME}" DESTINATION  "${DESTINATION_PATH}")
-endmacro()
-
-function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
-  set (${USE_PRODUCT} OFF PARENT_SCOPE)
-  
-  if (NOT USED_TOOLKITS)
-    message(STATUS "Warning: the list of being used toolkits is empty")
-  else()
-    foreach (USED_TOOLKIT ${USED_TOOLKITS})
-      if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
-        file (READ "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
-      elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
-        file (READ "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
-      endif()
-
-      string (REGEX MATCH "${CSF_VAR_NAME}" DOES_FILE_CONTAIN "${FILE_CONTENT}")
-
-      if (DOES_FILE_CONTAIN)
-        set (${USE_PRODUCT} ON PARENT_SCOPE)
-        break()
-      endif()
-    endforeach()
-  endif()
-endfunction()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/adm/templates/tbb.cmake
+++ b/adm/templates/tbb.cmake
@@ -1,241 +0,0 @@
-# tbb
-
-OCCT_MAKE_BUILD_POSTFIX()
-
-if (NOT DEFINED INSTALL_TBB)
-  set (INSTALL_TBB OFF CACHE BOOL "Is tbb required to be copied into install directory")
-endif()
-
-# tbb directory
-if (NOT DEFINED 3RDPARTY_TBB_DIR)
-  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
-endif()
-
-# tbb include directory
-if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of the tbb")
-endif()
-
-# tbb library file (with absolute path)
-if (NOT DEFINED 3RDPARTY_TBB_LIBRARY OR NOT 3RDPARTY_TBB_LIBRARY_DIR)
-  set (3RDPARTY_TBB_LIBRARY "" CACHE FILEPATH "tbb library" FORCE)
-endif()
-
-# tbb library directory
-if (NOT DEFINED 3RDPARTY_TBB_LIBRARY_DIR)
-  set (3RDPARTY_TBB_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tbb library")
-endif()
-
-# tbb malloc library file (with absolute path)
-if (NOT DEFINED 3RDPARTY_TBBMALLOC_LIBRARY OR NOT 3RDPARTY_TBBMALLOC_LIBRARY_DIR)
-  set (3RDPARTY_TBBMALLOC_LIBRARY "" CACHE FILEPATH "tbb malloc library" FORCE)
-endif()
-
-# tbb malloc library directory
-if (NOT DEFINED 3RDPARTY_TBBMALLOC_LIBRARY_DIR)
-  set (3RDPARTY_TBBMALLOC_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tbb malloc library")
-endif()
-
-# tbb shared library (with absolute path)
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_TBB_DLL OR NOT 3RDPARTY_TBB_DLL_DIR)
-    set (3RDPARTY_TBB_DLL "" CACHE FILEPATH "tbb shared library" FORCE)
-  endif()
-endif()
-
-# tbb shared library directory
-if (WIN32 AND NOT DEFINED 3RDPARTY_TBB_DLL_DIR)
-  set (3RDPARTY_TBB_DLL_DIR "" CACHE FILEPATH "The directory containing tbb shared library")
-endif()
-
-# tbb malloc shared library (with absolute path)
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_TBBMALLOC_DLL OR NOT 3RDPARTY_TBBMALLOC_DLL_DIR)
-    set (3RDPARTY_TBBMALLOC_DLL "" CACHE FILEPATH "tbb malloc shared library" FORCE)
-  endif()
-endif()
-
-# tbb malloc shared library directory
-if (NOT DEFINED 3RDPARTY_TBBMALLOC_DLL_DIR)
-  set (3RDPARTY_TBBMALLOC_DLL_DIR "" CACHE FILEPATH "The directory containing tbb malloc shared library")
-endif()
-
-# include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
-
-# search for product directory inside 3RDPARTY_DIR directory
-if (NOT 3RDPARTY_TBB_DIR AND 3RDPARTY_DIR)
-  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" "TBB" TBB_DIR_NAME)
-  if (TBB_DIR_NAME)
-    message (STATUS "Info: TBB: ${TBB_DIR_NAME} folder is used")
-    set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
-  endif()
-endif()
-
-OCCT_MAKE_COMPILER_BITNESS()
-
-if (${COMPILER_BITNESS} STREQUAL 32)
-  set (TBB_ARCH_NAME ia32)
-else()
-  set (TBB_ARCH_NAME intel64)
-endif()
-
-# search for include directory in defined 3rdparty directory
-if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
-  set (3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing the headers of tbb" FORCE)
-  find_path (3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include")
-endif()
-
-if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
-  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE FILEPATH "The directory containing the headers of tbb" FORCE)
-endif()
-
-OCCT_MAKE_COMPILER_SHORT_NAME()
-
-# TBB_COMPILER_FOLER
-#if (WIN32)
-  set (TBB_COMPILER_FOLER ${COMPILER})
-#else()
-#  set (TBB_COMPILER_FOLER ${COMPILER})
-#endif()
-
-OCCT_MAKE_BUILD_POSTFIX()
-
-# search for tbb and tbb malloc library in defined 3rdparty directory
-foreach (LIBRARY_NAME TBB TBBMALLOC)
-  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR)
-    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${LIBRARY_NAME} library" FORCE)
-  elseif (3RDPARTY_${LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
-    get_filename_component(3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR_TMP "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}" PATH)
-    if (NOT "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" STREQUAL "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR_TMP}")
-      set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${LIBRARY_NAME} library" FORCE)
-    endif()
-  endif()
-
-  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
-    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "3RDPARTY_${LIBRARY_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "Path to library of ${LIBRARY_NAME}" FORCE)
-
-    # first of all, search for debug version of a library if build type is debug
-    if (DEFINED IS_BUILD_DEBUG)
-      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME}_debug
-                                                     PATHS
-                                                      "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}"
-                                                      "${3RDPARTY_TBB_DIR}/libd/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
-                                                      "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
-                                                     NO_DEFAULT_PATH)
-
-      # second search if previous one do not find anything
-      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME}_debug)
-    endif()
-
-    # if build type is release or debug version of library isn't found - search for release version of one
-    if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
-      set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "3RDPARTY_${LIBRARY_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "Path to library of ${LIBRARY_NAME}" FORCE)
-
-      if (DEFINED IS_BUILD_DEBUG)
-        message (STATUS "Warning: debug version of ${LIBRARY_NAME} library isn't found (${LIBRARY_NAME}_debug) in ${3RDPARTY_TBB_DIR}/lib(d). Search for release one")
-      endif()
-
-      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME}
-                                                     PATHS
-                                                      "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}"
-                                                      "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
-                                                     NO_DEFAULT_PATH)
-
-      # second search if previous one do not find anything
-      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME})
-    endif()
-  endif()
-
-  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}")
-    get_filename_component(3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}" PATH)
-    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} library" FORCE)
-  endif()
-
-  # search for dll in defined 3rdparty directory (just for win case)
-  if (WIN32)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
-    
-    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL_DIR)
-      set (3RDPARTY_${LIBRARY_NAME}_DLL "" CACHE FILEPATH "${LIBRARY_NAME} shared library" FORCE)
-    elseif (3RDPARTY_${LIBRARY_NAME}_DLL AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
-      get_filename_component(3RDPARTY_${LIBRARY_NAME}_DLL_DIR_TMP "${3RDPARTY_${LIBRARY_NAME}_DLL}" PATH)
-      if (NOT "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}" STREQUAL "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR_TMP}")
-        set (3RDPARTY_${LIBRARY_NAME}_DLL "" CACHE FILEPATH "${LIBRARY_NAME} shared library" FORCE)
-      endif()
-    endif()
-
-    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
-      set (3RDPARTY_${LIBRARY_NAME}_DLL "3RDPARTY_${LIBRARY_NAME}_DLL-NOTFOUND" CACHE FILEPATH "Path to shared library of ${LIBRARY_NAME}" FORCE)
-
-      if (DEFINED IS_BUILD_DEBUG)
-        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME}_debug
-                                       PATHS
-                                        "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}"
-                                        "${3RDPARTY_TBB_DIR}/bind/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
-                                        "${3RDPARTY_TBB_DIR}/bin/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
-                                       NO_DEFAULT_PATH)
-
-        # second search if previous one do not find anything
-        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME}_debug)
-      endif()
-
-      if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
-        set (3RDPARTY_${LIBRARY_NAME}_DLL "3RDPARTY_${LIBRARY_NAME}_DLL-NOTFOUND" CACHE FILEPATH "Path to shared library of ${LIBRARY_NAME}" FORCE)
-
-        if (DEFINED IS_BUILD_DEBUG)
-          message (STATUS "Warning: debug version of ${LIBRARY_NAME} dll isn't found (${LIBRARY_NAME}_debug) in ${3RDPARTY_TBB_DIR}/bin(d). Search for release one")
-        endif()
-
-        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME}
-                                                   PATHS
-                                                    "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}"
-                                                    "${3RDPARTY_TBB_DIR}/bin/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
-                                                   NO_DEFAULT_PATH)
-
-        # second search if previous one do not find anything
-        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME})
-      endif()
-    endif()
-    
-    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL_DIR OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}")
-      get_filename_component(3RDPARTY_${LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${LIBRARY_NAME}_DLL}" PATH)
-      set (3RDPARTY_${LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} shared library" FORCE)
-    endif()
-  endif() # end dll search
-endforeach() # end tbb / tbbmalloc
-
-# include found paths to common variables
-if (3RDPARTY_TBB_INCLUDE_DIR AND EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-endif()
-
-foreach (LIBRARY_NAME TBB TBBMALLOC)
-  if (3RDPARTY_${LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}")
-  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR)
-  endif()
-
-  if (WIN32)
-    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBRARY_NAME}_DLL_DIR)
-    endif()
-  endif()
-endforeach()
-
-# install tbb
-if (INSTALL_TBB)
-  OCCT_MAKE_OS_WITH_BITNESS()
-  OCCT_MAKE_COMPILER_SHORT_NAME()
-
-  if (WIN32)
-    install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
-  else()
-    install (FILES ${3RDPARTY_TBB_LIBRARY} ${3RDPARTY_TBBMALLOC_LIBRARY} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
-  endif()
-endif()
-
-mark_as_advanced (3RDPARTY_TBB_LIBRARY 3RDPARTY_TBBMALLOC_LIBRARY 3RDPARTY_TBB_DLL 3RDPARTY_TBBMALLOC_DLL)
--- a/adm/templates/template.ac
+++ b/adm/templates/template.ac
--- a/adm/templates/template.mam
+++ b/adm/templates/template.mam
@@ -0,0 +1,22 @@
+# Makefile.am for Open Cascade toolkit __TKNAM__
+srcdir = @srcdir@
+
+VPATH = @srcdir@ : \
+__VPATH__
+
+AM_CXXFLAGS = __CXXFLAG__
+
+AM_CFLAGS = __CFLAG__
+
+INCLUDES = $(CSF_OPT_INCLUDES) __EXTERNINC__ \
+-I@top_srcdir@/inc \
+__INCLUDES__
+
+lib_LTLIBRARIES=lib__TKNAM__.la
+
+lib__TKNAM___la_LIBADD = $(CSF_OPT_LIBS) \
+__LIBADD__ \
+__EXTERNLIB__
+
+lib__TKNAM___la_SOURCES = \
+__SOURCES__
--- a/adm/templates/template.mamx
+++ b/adm/templates/template.mamx
@@ -0,0 +1,10 @@
+# Makefile.am for executable __XQTNAM__
+srcdir = @srcdir@
+
+VPATH = @srcdir@ : \
+@top_srcdir@/src/__XQTNAM__
+
+INCLUDES = $(CSF_OPT_INCLUDES) __EXTERNINC__ \
+-I@top_srcdir@/inc \
+-I@top_srcdir@/src/__XQTNAM__
+
--- a/adm/templates/template.plist
+++ b/adm/templates/template.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>__TOOLKIT_NAME__.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>__TOOLKIT_GUID__</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
--- a/adm/templates/template.vc10
+++ b/adm/templates/template.vc10
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc10\obj\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc10\objd\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc10\obj\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc10\objd\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc10\bin\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win32\vc10\obj\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc10\obj\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc10\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win32\vc10\bin\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win32\vc10\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc10\lib\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc10\bind\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win32\vc10\objd\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc10\objd\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc10\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win32\vc10\bind\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win32\vc10\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc10\libd\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc10\bin\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win64\vc10\obj\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc10\obj\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc10\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win64\vc10\bin\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win64\vc10\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc10\lib\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc10\bind\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win64\vc10\objd\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc10\objd\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc10\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win64\vc10\bind\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win64\vc10\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc10\libd\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+__FILES__
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="__TKNAM__.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/adm/templates/template.vc10x
+++ b/adm/templates/template.vc10x
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc10\obj\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc10\objd\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc10\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc10\obj\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc10\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc10\objd\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc10\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win32\vc10\obj\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc10\obj\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc10\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win32\vc10\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc10\lib\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc10\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win32\vc10\objd\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc10\objd\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc10\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win32\vc10\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc10\libd\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc10\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win64\vc10\obj\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc10\obj\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc10\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win64\vc10\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc10\lib\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc10\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win64\vc10\objd\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc10\objd\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc10\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win64\vc10\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc10\libd\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+__FILES__  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/adm/templates/template.vc11
+++ b/adm/templates/template.vc11
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc11\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc11\obj\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc11\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc11\objd\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc11\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc11\obj\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc11\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc11\objd\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc11\bin\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win32\vc11\obj\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc11\obj\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc11\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win32\vc11\bin\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win32\vc11\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc11\lib\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc11\bind\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win32\vc11\objd\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc11\objd\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc11\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win32\vc11\bind\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win32\vc11\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc11\libd\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc11\bin\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win64\vc11\obj\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc11\obj\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc11\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win64\vc11\bin\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win64\vc11\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc11\lib\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc11\bind\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win64\vc11\objd\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc11\objd\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc11\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win64\vc11\bind\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win64\vc11\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc11\libd\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+__FILES__
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="__TKNAM__.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/adm/templates/template.vc11x
+++ b/adm/templates/template.vc11x
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc11\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc11\obj\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc11\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc11\objd\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc11\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc11\obj\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc11\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc11\objd\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc11\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win32\vc11\obj\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc11\obj\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc11\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win32\vc11\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc11\lib\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc11\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win32\vc11\objd\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc11\objd\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc11\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win32\vc11\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc11\libd\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc11\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win64\vc11\obj\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc11\obj\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc11\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win64\vc11\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc11\lib\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc11\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win64\vc11\objd\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc11\objd\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc11\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win64\vc11\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc11\libd\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+__FILES__  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/adm/templates/template.vc12
+++ b/adm/templates/template.vc12
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc12\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc12\obj\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc12\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc12\objd\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc12\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc12\obj\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc12\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc12\objd\__TKNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc12\bin\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win32\vc12\obj\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc12\obj\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc12\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win32\vc12\bin\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win32\vc12\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc12\lib\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc12\bind\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win32\vc12\objd\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc12\objd\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc12\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win32\vc12\bind\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win32\vc12\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc12\libd\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc12\bin\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win64\vc12\obj\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc12\obj\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc12\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win64\vc12\bin\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win64\vc12\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc12\lib\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc12\bind\__TKNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win64\vc12\objd\__TKNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc12\objd\__TKNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc12\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <FloatingPointModel>Precise</FloatingPointModel>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\..\..\..\win64\vc12\bind\__TKNAM__.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win64\vc12\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc12\libd\__TKNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+__FILES__
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="__TKNAM__.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/adm/templates/template.vc12x
+++ b/adm/templates/template.vc12x
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>__CONF__</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc12\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\vc12\obj\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc12\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\vc12\objd\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc12\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\vc12\obj\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc12\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\vc12\objd\__XQTNAM__\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc12\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win32\vc12\obj\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc12\obj\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc12\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win32\vc12\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc12\lib\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win32\vc12\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win32\vc12\objd\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win32\vc12\objd\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\vc12\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win32\vc12\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win32\vc12\libd\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc12\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <AssemblerListingLocation>.\..\..\..\win64\vc12\obj\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc12\obj\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc12\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\..\..\..\win64\vc12\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc12\lib\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>x64</TargetEnvironment>
+      <TypeLibraryName>.\..\..\..\win64\vc12\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <AssemblerListingLocation>.\..\..\..\win64\vc12\objd\__XQTNAM__/</AssemblerListingLocation>
+      <ObjectFileName>.\..\..\..\win64\vc12\objd\__XQTNAM__/</ObjectFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\vc12\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>..\..\..\win64\vc12\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>..\..\..\win64\vc12\libd\__XQTNAM__.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+__FILES__  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/adm/templates/template.vc7
+++ b/adm/templates/template.vc7
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="__TKNAM__"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\win32\vc7\bin"
+			IntermediateDirectory=".\..\..\..\win32\vc7\obj\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc7\obj\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\..\..\..\win32\vc7\bin\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\lib;$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile=".\..\..\..\win32\vc7\bin\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win32\vc7\lib\__TKNAM__.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc7\bin\__TKNAM__.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\win32\vc7\bind"
+			IntermediateDirectory=".\..\..\..\win32\vc7\objd\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			ManagedExtensions="FALSE"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+        BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\..\..\..\win32\vc7\bind\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\libd;$(CSF_OPT_LIB32D)"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\..\win32\vc7\bind\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win32\vc7\libd\__TKNAM__.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc7\bind\__TKNAM__.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source files"
+			Filter="">
+__FILES__
+			<File RelativePath="__TKNAM__.rc"></File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/adm/templates/template.vc7x
+++ b/adm/templates/template.vc7x
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="__XQTNAM__"
+	ProjectGUID="{193A5B07-7F8B-4280-9F4E-32D5F326DFC5}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\win32\vc7\bind"
+			IntermediateDirectory=".\..\..\..\win32\vc7\objd\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\libd;$(CSF_OPT_LIB32D)"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\..\..\..\win32\vc7\bind\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win32\vc7\libd\__XQTNAM__.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc7\bind\__XQTNAM__.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\win32\vc7\bin"
+			IntermediateDirectory=".\..\..\..\win32\vc7\obj\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\lib;$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile=".\..\..\..\win32\vc7\bin\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win32\vc7\lib\__XQTNAM__.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc7\bin\__XQTNAM__.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+__FILES__
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/adm/templates/template.vc8
+++ b/adm/templates/template.vc8
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="__TKNAM__"
+	ProjectGUID="__PROJECT_GUID__"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\win32\vc8\bin"
+			IntermediateDirectory=".\..\..\..\win32\vc8\obj\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc8\bin\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc8\obj\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+				EnableEnhancedInstructionSet="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\..\..\..\win32\vc8\bin\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\lib;$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile=".\..\..\..\win32\vc8\bin\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win32\vc8\lib\__TKNAM__.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+ 				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\win32\vc8\bind"
+			IntermediateDirectory=".\..\..\..\win32\vc8\objd\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			ManagedExtensions="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc8\bind\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc8\objd\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+				EnableEnhancedInstructionSet="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\..\..\..\win32\vc8\bind\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\libd;$(CSF_OPT_LIB32D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\..\win32\vc8\bind\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win32\vc8\libd\__TKNAM__.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\win64\vc8\bin"
+			IntermediateDirectory=".\..\..\..\win64\vc8\obj\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc8\bin\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc8\obj\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\..\..\..\win64\vc8\bin\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\lib;$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile=".\..\..\..\win64\vc8\bin\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win64\vc8\lib\__TKNAM__.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+ 				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\win64\vc8\bind"
+			IntermediateDirectory=".\..\..\..\win64\vc8\objd\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			ManagedExtensions="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc8\bind\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc8\objd\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ opengl32.lib glu32.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\..\..\..\win64\vc8\bind\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\libd;$(CSF_OPT_LIB64D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\..\win64\vc8\bind\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win64\vc8\libd\__TKNAM__.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source files"
+			>
+__FILES__
+			<File RelativePath="__TKNAM__.rc"></File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/adm/templates/template.vc8x
+++ b/adm/templates/template.vc8x
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="__XQTNAM__"
+	ProjectGUID="__PROJECT_GUID__"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\win32\vc8\bind"
+			IntermediateDirectory=".\..\..\..\win32\vc8\objd\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc8\bind\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+				EnableEnhancedInstructionSet="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN32;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\libd;$(CSF_OPT_LIB32D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\..\..\..\win32\vc8\bind\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win32\vc8\libd\__XQTNAM__.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\win32\vc8\bin"
+			IntermediateDirectory=".\..\..\..\win32\vc8\obj\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc8\bin\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+				EnableEnhancedInstructionSet="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN32;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\lib;$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile=".\..\..\..\win32\vc8\bin\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win32\vc8\lib\__XQTNAM__.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\win64\vc8\bind"
+			IntermediateDirectory=".\..\..\..\win64\vc8\objd\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc8\bind\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				OutputFile=".\..\..\..\win64\vc8\bind\__XQTNAM__.__XQTEXT__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\libd;$(CSF_OPT_LIB64D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\..\..\..\win64\vc8\bind\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win64\vc8\libd\__XQTNAM__.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\win64\vc8\bin"
+			IntermediateDirectory=".\..\..\..\win64\vc8\obj\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc8\bin\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				OutputFile=".\..\..\..\win64\vc8\bin\__XQTNAM__.__XQTEXT__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\lib;$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile=".\..\..\..\win64\vc8\bin\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win64\vc8\lib\__XQTNAM__.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			>
+__FILES__
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/adm/templates/template.vc9
+++ b/adm/templates/template.vc9
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="__TKNAM__"
+	ProjectGUID="__PROJECT_GUID__"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\win32\vc9\bin"
+			IntermediateDirectory=".\..\..\..\win32\vc9\obj\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc9\bin\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP /bigobj"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableEnhancedInstructionSet="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc9\obj\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib vfw32.lib"
+				OutputFile=".\..\..\..\win32\vc9\bin\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\lib;$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile=".\..\..\..\win32\vc9\bin\__TKNAM__.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="..\..\..\win32\vc9\lib\__TKNAM__.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\win32\vc9\bind"
+			IntermediateDirectory=".\..\..\..\win32\vc9\objd\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			ManagedExtensions="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc9\bind\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc9\objd\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib vfw32.lib"
+				OutputFile=".\..\..\..\win32\vc9\bind\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\libd;$(CSF_OPT_LIB32D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\..\win32\vc9\bind\__TKNAM__.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				ImportLibrary="..\..\..\win32\vc9\libd\__TKNAM__.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\win64\vc9\bin"
+			IntermediateDirectory=".\..\..\..\win64\vc9\obj\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc9\bin\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP -favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc9\obj\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib vfw32.lib"
+				OutputFile=".\..\..\..\win64\vc9\bin\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\lib;$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile=".\..\..\..\win64\vc9\bin\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win64\vc9\lib\__TKNAM__.lib"
+				TargetMachine="X64"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\win64\vc9\bind"
+			IntermediateDirectory=".\..\..\..\win64\vc9\objd\__TKNAM__"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			ManagedExtensions="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc9\bind\__TKNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP -favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				FloatingPointModel="0"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc9\objd\__TKNAM__\__TKNAM__.pch"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__TKNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib vfw32.lib"
+				OutputFile=".\..\..\..\win64\vc9\bind\__TKNAM__.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\libd;$(CSF_OPT_LIB64D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\..\win64\vc9\bind\__TKNAM__.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\..\win64\vc9\libd\__TKNAM__.lib"
+				TargetMachine="X64"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source files"
+			>
+__FILES__
+			<File RelativePath="__TKNAM__.rc"></File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/adm/templates/template.vc9x
+++ b/adm/templates/template.vc9x
@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="__XQTNAM__"
+	ProjectGUID="__PROJECT_GUID__"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\win32\vc9\bin"
+			IntermediateDirectory=".\..\..\..\win32\vc9\obj\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc9\bin\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableEnhancedInstructionSet="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\lib;$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile=".\..\..\..\win32\vc9\bin\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win32\vc9\lib\__XQTNAM__.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\win32\vc9\bind"
+			IntermediateDirectory=".\..\..\..\win32\vc9\objd\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win32\vc9\bind\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\libd;$(CSF_OPT_LIB32D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\..\..\..\win32\vc9\bind\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win32\vc9\libd\__XQTNAM__.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\win64\vc9\bin"
+			IntermediateDirectory=".\..\..\..\win64\vc9\obj\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc9\bin\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP -favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				OutputFile=".\..\..\..\win64\vc9\bin\__XQTNAM__.__XQTEXT__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\lib;$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile=".\..\..\..\win64\vc9\bin\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win64\vc9\lib\__XQTNAM__.lib"
+				TargetMachine="X64"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\win64\vc9\bind"
+			IntermediateDirectory=".\..\..\..\win64\vc9\objd\__XQTNAM__"
+			ConfigurationType="__CONF__"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\win64\vc9\bind\__XQTNAM__.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-MP -favor:blend"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				Optimization="0"
+				PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				FloatingPointModel="0"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="__TKDEP__"
+				OutputFile=".\..\..\..\win64\vc9\bind\__XQTNAM__.__XQTEXT__"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\libd;$(CSF_OPT_LIB64D)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\..\..\..\win64\vc9\bind\__XQTNAM__.pdb"
+				SubSystem="1"
+				ImportLibrary="..\..\..\win64\vc9\libd\__XQTNAM__.lib"
+				TargetMachine="X64"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			>
+__FILES__
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/adm/templates/template.xcscheme
+++ b/adm/templates/template.xcscheme
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "__TOOLKIT_GUID__"
+               BuildableName = "lib__TOOLKIT_NAME__.dylib"
+               BlueprintName = "__TOOLKIT_NAME__"
+               ReferencedContainer = "container:__TOOLKIT_NAME__.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/adm/templates/template_dll.rc
+++ b/adm/templates/template_dll.rc
@@ -0,0 +1,30 @@
+#include <windows.h>
+#include <Standard_Version.hxx>
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
+PRODUCTVERSION  OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#endif
+FILEOS          VOS_NT
+FILETYPE        VFT_DLL
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN BLOCK "040904E4" // Language type = U.S English(0x0409) and Character Set = Windows, Multilingual(0x04E4)
+    BEGIN
+      VALUE "FileDescription", "__TKNAM__ Toolkit\000"
+      VALUE "FileVersion",     OCC_VERSION_STRING_EXT "\000"
+      VALUE "LegalCopyright",  "\251 OPEN CASCADE SAS\000"
+      VALUE "ProductName",     "__TKNAM__\000"
+      VALUE "ProductVersion",  OCC_VERSION_STRING_EXT "\000"
+      VALUE "OfficialSite",    "www.opencascade.org\000"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 0x04E4
+  END
+END
--- a/adm/templates/vcproj.user.vc9x
+++ b/adm/templates/vcproj.user.vc9x
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="9.00"
+	ShowAllFiles="false"
+	>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			>
+			<DebugSettings
+				Environment="PATH=..\..\..\win32\vc9\bin;$(CSF_OPT_BIN32);$(PATH)"
+				EnvironmentMerge="true"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			>
+			<DebugSettings
+				Environment="PATH=..\..\..\win64\vc9\bin;$(CSF_OPT_BIN64);$(PATH)"
+				EnvironmentMerge="true"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			>
+			<DebugSettings
+				Environment="PATH=..\..\..\win32\vc9\bind;$(CSF_OPT_BIN32D);$(PATH)"
+				EnvironmentMerge="true"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			>
+			<DebugSettings
+				Environment="PATH=..\..\..\win64\vc9\bind;$(CSF_OPT_BIN64D);$(PATH)"
+				EnvironmentMerge="true"
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioUserFile>
--- a/adm/templates/vcxproj.user.vc10x
+++ b/adm/templates/vcxproj.user.vc10x
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\vc10\bind;$(CSF_OPT_BIN32D);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\vc10\bin;$(CSF_OPT_BIN32);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\vc10\bin;$(CSF_OPT_BIN64);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\vc10\bind;$(CSF_OPT_BIN64D);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
--- a/adm/templates/vcxproj.user.vc11x
+++ b/adm/templates/vcxproj.user.vc11x
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\vc11\bind;$(CSF_OPT_BIN32D);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\vc11\bin;$(CSF_OPT_BIN32);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\vc11\bin;$(CSF_OPT_BIN64);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\vc11\bind;$(CSF_OPT_BIN64D);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
--- a/adm/templates/vcxproj.user.vc12x
+++ b/adm/templates/vcxproj.user.vc12x
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\vc12\bind;$(CSF_OPT_BIN32D);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\vc12\bin;$(CSF_OPT_BIN32);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\vc12\bin;$(CSF_OPT_BIN64);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\vc12\bind;$(CSF_OPT_BIN64D);$(PATH)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
--- a/adm/templates/vtk.cmake
+++ b/adm/templates/vtk.cmake
@@ -1,156 +0,0 @@
-# vtk
-
-if (NOT DEFINED INSTALL_VTK)
-  set (INSTALL_VTK OFF CACHE BOOL "Is vtk required to be copied into install directory")
-endif()
-
-# vtk directory
-if (NOT DEFINED 3RDPARTY_VTK_DIR)
-  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing vtk")
-endif()
-
-# vtk include directory
-if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
-  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of vtk")
-endif()
-
-# vtk library directory
-if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
-  set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing vtk library")
-endif()
-
-# vtk dll directory
-if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
-  set (3RDPARTY_VTK_DLL_DIR "" CACHE FILEPATH "The directory containing VTK dll")
-endif()
-
-# search for vtk in user defined directory
-if (NOT 3RDPARTY_VTK_DIR AND 3RDPARTY_DIR)
-  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" vtk VTK_DIR_NAME)
-  if (VTK_DIR_NAME)
-    set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing vtk product" FORCE)
-  endif()
-endif()
-
-# find installed vtk
-find_package(VTK QUIET)
-
-# find native vtk
-if (NOT VTK_FOUND)
-  find_package(VTK QUIET PATHS "${3RDPARTY_VTK_DIR}")
-endif()
-
-if (NOT VTK_FOUND AND NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
-  message(SEND_ERROR "VTK not found. Set the 3RDPARTY_VTK_DIR cmake cache entry to the directory containing VTK.")
-  set (3RDPARTY_VTK_DIR "3RDPARTY_VTK_DIR-NOTFOUND" CACHE PATH "The directory containing vtk product" FORCE)
-endif()
-
-OCCT_MAKE_BUILD_POSTFIX()
-set(VTK_VERSION "")
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-  get_filename_component(3RDPARTY_VTK_DIR_NAME "${3RDPARTY_VTK_DIR}" NAME)
-  string(REGEX MATCH "^VTK-([0-9].[0-9])" VTK_VERSION "${3RDPARTY_VTK_DIR_NAME}")
-  set(VTK_VERSION "${CMAKE_MATCH_1}")
-  if (NOT 3RDPARTY_VTK_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
-    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_DIR}/include/vtk-${VTK_VERSION}" CACHE FILEPATH "The directory containing includes of VTK" FORCE)
-  endif()
-  if (NOT 3RDPARTY_VTK_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
-    if(EXISTS "${3RDPARTY_VTK_DIR}/lib${BUILD_POSTFIX}")
-      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_DIR}/lib${BUILD_POSTFIX}" CACHE FILEPATH "The directory containing libs of VTK" FORCE)
-    else()
-	  if (NOT "${BUILD_POSTFIX}" STREQUAL "" AND EXISTS "${3RDPARTY_VTK_DIR}/lib")
-	    set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_DIR}/lib" CACHE FILEPATH "The directory containing libs of VTK" FORCE)
-      endif()
-	endif()
-  endif()
-  if(3RDPARTY_VTK_LIBRARY_DIR)
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_VTK_LIBRARY_DIR}")
-  endif()
-endif()
-
-# vtk libraries
-# lib
-set (VTK_LIBRARY_NAMES vtkCommonCore-${VTK_VERSION}.lib vtkCommonDataModel-${VTK_VERSION}.lib vtkCommonExecutionModel-${VTK_VERSION}.lib 
-                       vtkCommonMath-${VTK_VERSION}.lib vtkCommonTransforms-${VTK_VERSION}.lib vtkRenderingCore-${VTK_VERSION}.lib 
-                       vtkRenderingOpenGL-${VTK_VERSION}.lib vtkFiltersGeneral-${VTK_VERSION}.lib vtkIOCore-${VTK_VERSION}.lib 
-                       vtkIOImage-${VTK_VERSION}.lib vtkImagingCore-${VTK_VERSION}.lib vtkInteractionStyle-${VTK_VERSION}.lib )
-
-#dll
-set (VTK_DLL_NAMES vtkCommonComputationalGeometry-${VTK_VERSION}.dll
-                   vtkCommonCore-${VTK_VERSION}.dll
-                   vtkCommonDataModel-${VTK_VERSION}.dll
-                   vtkCommonExecutionModel-${VTK_VERSION}.dll
-                   vtkCommonMath-${VTK_VERSION}.dll
-                   vtkCommonMisc-${VTK_VERSION}.dll
-                   vtkCommonSystem-${VTK_VERSION}.dll
-                   vtkCommonTransforms-${VTK_VERSION}.dll
-                   vtkDICOMParser-${VTK_VERSION}.dll
-                   vtkFiltersCore-${VTK_VERSION}.dll
-                   vtkFiltersExtraction-${VTK_VERSION}.dll
-                   vtkFiltersGeneral-${VTK_VERSION}.dll
-                   vtkFiltersGeometry-${VTK_VERSION}.dll
-                   vtkFiltersSources-${VTK_VERSION}.dll
-                   vtkFiltersStatistics-${VTK_VERSION}.dll
-                   vtkIOCore-${VTK_VERSION}.dll
-                   vtkIOImage-${VTK_VERSION}.dll
-                   vtkImagingCore-${VTK_VERSION}.dll
-                   vtkImagingFourier-${VTK_VERSION}.dll
-                   vtkImagingHybrid-${VTK_VERSION}.dll
-                   vtkInteractionStyle-${VTK_VERSION}.dll
-                   vtkRenderingCore-${VTK_VERSION}.dll
-                   vtkRenderingOpenGL-${VTK_VERSION}.dll
-                   vtkalglib-${VTK_VERSION}.dll
-                   vtkjpeg-${VTK_VERSION}.dll
-                   vtkmetaio-${VTK_VERSION}.dll
-                   vtkpng-${VTK_VERSION}.dll
-                   vtksys-${VTK_VERSION}.dll
-                   vtktiff-${VTK_VERSION}.dll
-                   vtkzlib-${VTK_VERSION}.dll )
-
-# search for dll directory
-if (WIN32)
-  if (NOT 3RDPARTY_VTK_DLL_DIR OR NOT EXISTS "${3RDPARTY_VTK_DLL_DIR}")
-    if(EXISTS "${3RDPARTY_VTK_DIR}/bin${BUILD_POSTFIX}")
-      set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bin${BUILD_POSTFIX}" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
-    else()
-	  if (NOT "${BUILD_POSTFIX}" STREQUAL "" AND EXISTS "${3RDPARTY_VTK_DIR}/bin")
-	    set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bin" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
-      endif()
-	endif()
-  endif()
-endif() 
-
-OCCT_CHECK_AND_UNSET(VTK_DIR)
-
-if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_VTK_INCLUDE_DIR}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_DIR)
-endif()
-
-if (INSTALL_VTK)
-  OCCT_MAKE_OS_WITH_BITNESS()
-  OCCT_MAKE_COMPILER_SHORT_NAME()
-  if (WIN32)
-    if(3RDPARTY_VTK_DLL_DIR AND EXISTS "${3RDPARTY_VTK_DLL_DIR}")
-      set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
-      foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
-        set (3RDPARTY_VTK_DLL "3RDPARTY_VTK_DLL-NOTFOUND" CACHE FILEPATH "VTK shared library" FORCE)
-        find_library(3RDPARTY_VTK_DLL "${VTK_DLL_NAME}" PATHS "${3RDPARTY_VTK_DLL_DIR}" NO_DEFAULT_PATH)
-        if (NOT 3RDPARTY_VTK_DLL OR NOT EXISTS "${3RDPARTY_VTK_DLL}")
-          list (APPEND 3RDPARTY_NOT_INCLUDED "${3RDPARTY_VTK_DLL}")
-        else()
-          install (FILES ${3RDPARTY_VTK_DLL} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
-        endif()
-      endforeach()
-      OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL)
-    endif()
-  else ()
-    foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
-      string(REPLACE ".dll" ".so.1" VTK_DLL_NAME "${VTK_DLL_NAME}")
-      install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}" RENAME "lib${VTK_DLL_NAME}")
-    endforeach()
-  endif()
-endif()
-
-mark_as_advanced (VTK_INCLUDE_DIRS VTK_LIBRARY_DIRS VTK_DIR)
--- a/adm/templates/xcode.sh
+++ b/adm/templates/xcode.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export TARGET="xcd"
+
+source ./env.sh "$1" "$TARGET"
+
+open -a Xcode ./adm/mac/xcd/OCCT.xcworkspace
--- a/data/csfdb/Motor-c.csfdb
+++ b/data/csfdb/Motor-c.csfdb
--- a/data/csfdb/Motor-compound.csfdb
+++ b/data/csfdb/Motor-compound.csfdb
--- a/data/occ/Motor-c.brep
+++ b/data/occ/Motor-c.brep
--- a/dox/CMakeLists.txt
+++ b/dox/CMakeLists.txt
@@ -0,0 +1,104 @@
+project (Overview)
+
+# directory that contains all raw OCCT overview articles (markdown format)
+set (OCCT_OVERVIEW_DIR "${CMAKE_SOURCE_DIR}/dox")
+
+# directory that contains resources for the generation of OCCT documentation
+set (OCCT_OVERVIEW_RESOURCE_DIR "${OCCT_OVERVIEW_DIR}/resources")
+
+# directory that contains all generated OCCT articles
+set (OCCT_GENERATED_DOC_DIR "${CMAKE_BINARY_DIR}/doc")
+if (NOT EXISTS "${OCCT_GENERATED_DOC_DIR}")
+  file (MAKE_DIRECTORY "${OCCT_GENERATED_DOC_DIR}")
+endif()
+
+# directory that contains generated OCCT overview articles
+set (OCCT_GENERATED_OVERVIEW_DIR "${OCCT_GENERATED_DOC_DIR}/overview")
+if (NOT EXISTS "${OCCT_GENERATED_OVERVIEW_DIR}")
+  file (MAKE_DIRECTORY "${OCCT_GENERATED_OVERVIEW_DIR}")
+endif()
+
+# directory that contains generated OCCT overview articles in html format
+set (OCCT_GENERATED_HTML_OVERVIEW_DIR "${OCCT_GENERATED_OVERVIEW_DIR}/html")
+if (NOT EXISTS "${OCCT_GENERATED_HTML_OVERVIEW_DIR}")
+  file (MAKE_DIRECTORY "${OCCT_GENERATED_HTML_OVERVIEW_DIR}")
+endif()
+
+# read OCCT articles that should be generated
+set (OCCT_ARTICLES "")
+if (EXISTS "${OCCT_OVERVIEW_DIR}/FILES_HTML.txt" )
+  file (STRINGS "${OCCT_OVERVIEW_DIR}/FILES_HTML.txt" OCCT_ARTICLES REGEX "^[^#]+")
+else()
+  message (FATAL_ERROR "FILES_HTML.txt is not found in ${OCCT_OVERVIEW_DIR}")
+endif()
+
+# configuration file for doxygen
+set (OCCT_CONFIG_FOR_DOXYGEN "${OCCT_GENERATED_DOC_DIR}/occt.cfg")
+
+set (3RDPARTY_MATHJAX_RELATIVE_PATH "http://cdn.mathjax.org/mathjax/latest")
+
+OCCT_VERSION (OCCT_SOURCE_VERSION)
+
+configure_file ("${OCCT_OVERVIEW_RESOURCE_DIR}/occt_ug_html.doxyfile" "${OCCT_CONFIG_FOR_DOXYGEN}" COPYONLY)
+
+# Add common options for generation of Overview and User Guides
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nPROJECT_NUMBER         = ${OCCT_SOURCE_VERSION}")
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nOUTPUT_DIRECTORY       = ${OCCT_GENERATED_OVERVIEW_DIR}/.")
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nPROJECT_LOGO           = ${OCCT_OVERVIEW_DIR}/resources/occ_logo.png")
+
+set (OCCT_ARTICLE_PARAM_INPUT     "INPUT                  =")
+set (OCCT_ARTICLE_PARAM_IMAGEPATH "IMAGE_PATH             = ${OCCT_OVERVIEW_DIR}/resources/ ")
+
+set (OCCT_ARTICLES_ABSPATH "")
+foreach (OCCT_ARTICLE ${OCCT_ARTICLES})
+  get_filename_component (OCCT_ARTICLE_ABSOLUTE_PATH "${OCCT_OVERVIEW_DIR}/${OCCT_ARTICLE}" ABSOLUTE)
+  get_filename_component (OCCT_ARTICLE_PARENT_DIR "${OCCT_ARTICLE_ABSOLUTE_PATH}" PATH)
+
+  if (EXISTS "${OCCT_ARTICLE_PARENT_DIR}/images")
+    set (OCCT_ARTICLE_PARAM_IMAGEPATH "${OCCT_ARTICLE_PARAM_IMAGEPATH} ${OCCT_ARTICLE_PARENT_DIR}/images")
+  endif()
+
+  set (OCCT_ARTICLE_PARAM_INPUT "${OCCT_ARTICLE_PARAM_INPUT} ${OCCT_ARTICLE_ABSOLUTE_PATH}")
+
+  set (SOURCE_GROUP_NAME "")
+
+  # add the file to appropriate source group
+  get_filename_component (CURRENT_TAIL_PATH "${OCCT_ARTICLE}" PATH)
+  while (CURRENT_TAIL_PATH AND NOT "${CURRENT_TAIL_PATH}" STREQUAL "..")
+    get_filename_component (CURRENT_DIR_NAME "${CURRENT_TAIL_PATH}" NAME)
+    set (SOURCE_GROUP_NAME "${CURRENT_DIR_NAME}\\${SOURCE_GROUP_NAME}")
+
+    # one step out (get parent directory)
+    get_filename_component (CURRENT_TAIL_PATH "${CURRENT_TAIL_PATH}" PATH)
+  endwhile()
+  SOURCE_GROUP ("${SOURCE_GROUP_NAME}" FILES ${OCCT_ARTICLE_ABSOLUTE_PATH})
+
+  list (APPEND OCCT_ARTICLES_ABSPATH ${OCCT_ARTICLE_ABSOLUTE_PATH})
+endforeach()
+
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\n${OCCT_ARTICLE_PARAM_INPUT}")
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\n${OCCT_ARTICLE_PARAM_IMAGEPATH}")
+
+# Add document type-specific options
+# generate tree view
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nGENERATE_TREEVIEW      = YES")
+
+# HTML Search engine options
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nSEARCHENGINE           = YES")
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nSERVER_BASED_SEARCH    = YES")
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nEXTERNAL_SEARCH        = NO")
+
+# Formula options
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nMATHJAX_RELPATH        = ${3RDPARTY_MATHJAX_RELATIVE_PATH}")
+
+# Copy index file to provide fast access to HTML documentation
+file(COPY "${OCCT_OVERVIEW_RESOURCE_DIR}/index.html" DESTINATION "${OCCT_GENERATED_OVERVIEW_DIR}")
+
+add_custom_target (${PROJECT_NAME}
+                   COMMAND ${3RDPARTY_DOXYGEN_EXECUTABLE} ${OCCT_CONFIG_FOR_DOXYGEN}
+                   WORKING_DIRECTORY ${OCCT_GENERATED_DOC_DIR}
+                   COMMENT "Generating OCCT overview documentation with Doxygen"
+                   SOURCES ${OCCT_ARTICLES_ABSPATH}
+                   VERBATIM)
+
+set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Documentation")
--- a/dox/FILES_HTML.txt
+++ b/dox/FILES_HTML.txt
@@ -60,4 +60,6 @@ dev_guides/building/code_blocks.md
 dev_guides/building/msvc.md
 dev_guides/building/xcode.md

+dev_guides/upgrade/upgrade.md
+
 license.md
--- a/dox/dev_guides/building/cmake/cmake.md
+++ b/dox/dev_guides/building/cmake/cmake.md
@@ -17,16 +17,16 @@ instructions for your platform in @ref occt_dev_guides__building.

 ## Define the location of build and install directories.

-The build directory is where intermediate files (projects / makefiles, objects, binaries) will be created. Each built configuration should have its own build directory.
+The build directory is where intermediate files (projects / makefiles, objects, binaries) will be created.

 The install directory is where binaries will be installed after build, along with header files and resources required for OCCT use in applications. 
 It is possible to install several configurations of OCCT (differentiated by platform, bitness, compiler, and build type) into the same directory.

 It is recommended to separate build and install directories from OCCT source directory, for example:

-       /user/home/occt/                           - sources
-       /user/home/tmp/occt-build-vc10-x64-release - intermediate files
-       /user/home/occt-install                    - installed binaries
+       /user/home/occt/                   - sources
+       /user/home/tmp/occt-build-vc10-x64 - intermediate files
+       /user/home/occt-install            - installed binaries

 ## CMake usage

@@ -42,7 +42,7 @@ Specify the root folder of OCCT (<i>$CASROOT</i>, which contains *CMakelists.txt

 Specify the location (build folder) for Cmake generated project files by clicking **Browse Build**.

-Each configuration of the project should be built in its own directory. When building multiple configurations it is recommended to indicate in the name of build directories the system, bitness, compiler, and build type (e.g., <i>d:/occt/build/win32-vc9-debug</i> ).
+Each configuration of the project should be built in its own directory. When building multiple configurations it is recommended to indicate in the name of build directories the system, bitness, compiler, and build type (e.g., <i>d:/occt/build/win32-vc9</i> ).

 **Configure** opens the window with a drop-down list of generators supported by CMake project. Select the required generator (e.g., Visual Studio 2008) and click **Finish**.

@@ -52,7 +52,7 @@ Each configuration of the project should be built in its own directory. When bui

 In the console, change to the build directory and call *ccmake* with the path to the source directory of the project:

-       > cd ~/occt/build/debug
+       > cd ~/occt/build
       > ccmake ~/occt

@figure{/dev_guides/building/cmake/images/cmake_image003.png}
@@ -74,26 +74,29 @@ which need to be defined. This error will appear until all required variables ar

 Note: In *cmake-gui* there is "grouped" option, which groups variables with a common prefix.

+**Note**: If a single-configuration generator is chosen (such as make), there is the need to specify *CMAKE_BUILD_TYPE* variable
+with the value of further build type: Debug, Release or RelWithDebInfo.
+
 ### Selection of the components to be built

 The variables with <i>BUILD_</i> prefix allow specifying OCCT components and
 configuration to be built:

-* *BUILD_CONFIGURATION* - defines configuration to be built (Release by default).
-* <i>BUILD_<MODULE></i>      - specifies whether the corresponding OCCT module should be 
-                        built (all toolkits). Note that even if the whole module is not 
-                        selected for build, its toolkits used by other toolkits 
-                        selected for build will be included automatically.
-* *BUILD_TOOLKITS*      - allows including additional toolkits from non-selected 
-                        modules (should be list of toolkit names separated by a 
-                        space or a semicolon).
-* *BUILD_SAMPLES*       - specifies whether OCCT MFC samples should be built.
-* *BUILD_PATCH_DIR*     - optionally specifies additional folder containing patched OCCT source files.
-                        The patch may contain arbitrary subset of OCCT source files (including CMake scripts, templates, etc.), organized in the same structure of folders as OCCT.
-                        The projects generated by CMake will use files found in the patch folder instead of the corresponding files of OCCT.
+* *BUILD_LIBRARY_TYPE*     - specifies whether static or shared libraries should be built.
+* <i>BUILD_<MODULE></i>    - specifies whether the corresponding OCCT module should be 
+                             built (all toolkits). Note that even if the whole module is not 
+                             selected for build, its toolkits used by other toolkits 
+                             selected for build will be included automatically.
+* *BUILD_TOOLKITS*         - allows including additional toolkits from non-selected 
+                             modules (should be list of toolkit names separated by a 
+                             space or a semicolon).
+* *BUILD_MFC_SAMPLES*      - specifies whether OCCT MFC samples should be built.
+* *BUILD_OCCT_OVERVIEW*    - specifies whether OCCT overview documentation should be generated.
+* *BUILD_PATCH_DIR*        - optionally specifies additional folder containing patched OCCT source files.
+                             The patch may contain arbitrary subset of OCCT source files (including CMake scripts, templates, etc.), organized in the same structure of folders as OCCT.
+                             The projects generated by CMake will use files found in the patch folder instead of the corresponding files of OCCT.

-Check variables with <i>USE_</i> prefix (<i>USE_FREEIMAGE, USE_GL2PS, USE_TBB,</i> and 
-<i>USE_OPENCL</i>) if you want to enable use of the corresponding optional 3rd-party 
+Check variables with <i>USE_</i> prefix (<i>USE_FREEIMAGE, USE_GL2PS, USE_TBB,</i>) if there is the need to enable use of the corresponding optional 3rd-party 
 library.

 ### 3rd-party configuration (The variables with <i>3RDPARTY_</i> prefix)
@@ -116,7 +119,7 @@ The result of the search are recorded in the corresponding variables:
 * *3RDPARTY_\<PRODUCT\>_DLL_DIR* - path to the directory containing a shared library (e.g., <i>D:/3rdparty/tcltk-86-32/bin</i>) This variable is able just in windows case


-Note: a libraries and include directories should be the children of product directory if the last one is defined.
+Note: each library and include directory should be the children of product directory if the last one is defined.

 The search process is as follows:

@@ -161,6 +164,11 @@ change appropriate cmake variables (edit CMakeCache.txt file or edit in cmake-gu
 Define *INSTALL_DIR* variable as the path will be contain the built OCCT files (libraries, executables and headers)
 If <i>INSTALL_\<PRODUCT\></i> variable is checked, 3rd-party products will be copied to the install directory.

+Additional INSTALL_ variables:
+
+* INSTALL_SAMPLES       - copy all OCCT samples into the install folder
+* INSTALL_OCCT_OVERVIEW - copy generated OCCT overview documentation into the install folder
+
 At the end of the configuration process "configuring done" message will be shown and the generation process can be started.

 ## OCCT Generation
--- a/dox/dev_guides/debug/debug.md
+++ b/dox/dev_guides/debug/debug.md
@@ -35,41 +35,6 @@ This feature can be activated by defining environment variable *CSF_DEBUG_BOP*,

 The diagnostic code checks validity of the input arguments and the result of each Boolean operation. When an invalid situation is detected, the report consisting of argument shapes and a DRAW script to reproduce the problematic operation is saved to the directory pointed by *CSF_DEBUG_BOP*.

-@section occt_debug_commands DRAW debugging commands
-
-In this section description and usage of several debug commands represented.
-
-@subsection occt_debug_commands_xdist "xdist" commands family
-
-Commands with prefix "xdist" provides functionality to check distance between two objects on even grid:
-
-  * xdistef - distance between edge and face.
-  * xdistcs - distance between curve and surface. This means that projection to surface of each sample point computed.
-  * xdistcc - distance between two 3d curves.
-  * xdistcc2ds - distance between 3d curve and 2d curve on surface.
-  * xdistc2dc2dss - distance between two 2d curves on surface.
-
-**Usage:**
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-xdistef edge face
-xdistcs curve surface firstParam lastParam [NumberOfSamplePoints]
-xdistcc curve1 curve2 startParam finishParam [NumberOfSamplePoints]
-xdistcc2ds c curve2d surf startParam finishParam [NumberOfSamplePoints]
-xdistc2dc2dss curve2d_1 curve2d_2 surface_1 surface_2 startParam finishParam [NumberOfSamplePoints]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-It is assumed that curves have same parametrization range and startParam < finishParam.
-
-**Examples:** 
-~~~~~
-bopcurves b1 b2 -2d 
-mksurf s1 b1
-mksurf s2 b2
-xdistcs c_1 s1 0 1 100
-xdistcc2ds c_1 c2d2_1 s2 0 1
-xdistc2dc2dss c2d1_1 c2d2_1 s1 s2 0 1 1000
-~~~~~
-
@section occt_debug_call Functions for calling from debugger

 Modern interactive debuggers provide the possibility to execute application code at a program break point. This feature can be used to analyse the temporary objects available only in the context of the debugged code. OCCT provides several global functions that can be used in this way.
--- a/dox/dev_guides/dev_guides.md
+++ b/dox/dev_guides/dev_guides.md
@@ -11,8 +11,12 @@ The following documents provide information on OCCT building, development and te
 * @subpage occt_dev_guides__tests "Automatic Testing system"
 * @subpage occt_dev_guides__debug "Debugging tools and hints"

-Two other documents provide details on obsolete technologies used by OCCT, 
+These two documents provide details on obsolete technologies used by OCCT, 
 to be removed in future releases:

 * @subpage occt_dev_guides__wok "Workshop Organization Kit (WOK)"
 * @subpage occt_dev_guides__cdl "Component Definition Language (CDL)"
+
+The following guide provides information relevant to upgrading applications developed with previous versions of OCCT, to recent one:
+
+* @subpage occt_dev_guides__upgrade "Upgrade from previous OCCT versions"
--- a/dox/dev_guides/tests/tests.md
+++ b/dox/dev_guides/tests/tests.md
@@ -69,8 +69,8 @@ Example:
 Draw[]> testgrid
 ~~~~~

-For running only a subset of test cases, give masks for group, grid, and test case names to be executed.
-Each argument is a list of comma- or space-separated file masks; by default "*" is assumed.
+To run only a subset of test cases, give masks for group, grid, and test case names to be executed.
+Each argument is a list of file masks separated with commas or spaces; by default "*" is assumed.

 Example:

@@ -78,7 +78,6 @@ Example:
 Draw[]> testgrid bugs caf,moddata*,xde
 ~~~~~

-
 As the tests progress, the result of each test case is reported. 
 At the end of the log a summary of test cases is output, 
 including the list of detected regressions and improvements, if any. 
@@ -102,13 +101,13 @@ Example:
 The tests are considered as non-regressive if only OK, BAD (i.e. known problem), and SKIPPED (i.e. not executed, typically because of lack of a data file) statuses are reported. See <a href="#testmanual_3_5">Interpretation of test results</a> for details.

 The results and detailed logs of the tests are saved by default to a new subdirectory of the subdirectory *results* in the current folder, whose name is generated automatically using the current date and time, prefixed by Git branch name (if Git is available and current sources are managed by Git).
-If necessary, a non-default output directory can be specified using option <i> –outdir</i> followed by a path to the directory. This directory should be new or empty; use option –overwrite to allow writing results in existing non-empty directory. 
+If necessary, a non-default output directory can be specified using option <i> –outdir</i> followed by a path to the directory. This directory should be new or empty; use option <i>–overwrite</i> to allow writing results in the existing non-empty directory. 

 Example:
 ~~~~~
 Draw[]> testgrid -outdir d:/occt/last_results -overwrite
 ~~~~~
-In the output directory, a cumulative HTML report summary.html provides links to reports on each test case. An additional report in JUnit-style XML format can be output for use in Jenkins or other continuous integration system.
+In the output directory, a cumulative HTML report <i>summary.html</i> provides links to reports on each test case. An additional report in JUnit-style XML format can be output for use in Jenkins or other continuous integration system.

 Type <i>help testgrid</i> in DRAW prompt to get help on options supported by *testgrid* command:

@@ -144,7 +143,7 @@ Note that normally an intermediate output of the script is not shown. The detail
 To see intermediate commands and their output during the test execution, add one more argument 
 <i>"echo"</i> at the end of the command line. Note that with this option the log is not collected and summary is not produced.

-Type <i>help testgrid</i> in DRAW prompt to get help on options supported by *testgrid* command:
+Type <i>help test</i> in DRAW prompt to get help on options supported by *test* command:

 ~~~~~
 Draw[3]> help test
@@ -170,10 +169,10 @@ test: Run specified test case

 The detailed rules of creation of new tests are given in <a href="#testmanual_3">section 3</a>. The following short description covers the most typical situations:

-Use prefix "bug" followed by Mantis issue ID and, if necessary, additional suffixes, for naming the test script and DRAW commands specific for this test case.
+Use prefix <i>bug</i> followed by Mantis issue ID and, if necessary, additional suffixes, for naming the test script and DRAW commands specific for this test case.

 1.	If the test requires C++ code, add it as new DRAW command(s) in one of files in *QABugs* package. Note that this package defines macros *QVERIFY* and *QCOMPARE*, thus code created for QTest or GoogleTest frameworks can be used with minimal modifications.
-2.	Add script(s) for the test case in grid (subfolder) corresponding to the relevant OCCT module of the group bugs <i>($CASROOT/tests/bugs)</i>. See <a href="#testmanual_5_2">the correspondence map</a>.
+2.	Add script(s) for the test case in the subfolder corresponding to the relevant OCCT module of the group bugs <i>($CASROOT/tests/bugs)</i>. See <a href="#testmanual_5_2">the correspondence map</a>.
 3.	In the test script:
 	*	Load all necessary DRAW modules by command *pload*.
 	*	Use command *locate_data_file* to get a path to data files used by test script. (Make sure to have this command not inside catch statement if it is used.)
@@ -213,7 +212,7 @@ checkshape result
 Standard OCCT tests are located in subdirectory tests of the OCCT root folder ($CASROOT).

 Additional test folders can be added to the test system by defining environment variable *CSF_TestScriptsPath*. This should be list of paths separated by semicolons (*;*) on Windows 
-or colons (*:*) on Linux or Mac. Upon DRAW launch, path to tests sub-folder of OCCT is added at the end of this variable automatically. 
+or colons (*:*) on Linux or Mac. Upon DRAW launch, path to tests subfolder of OCCT is added at the end of this variable automatically. 

 Each test folder is expected to contain:
  * Optional file parse.rules defining patterns for interpretation of test results, common for all groups in this folder
@@ -456,15 +455,15 @@ If the new test corresponds to a functionality already covered by the existing s

@subsection testmanual_3_2 Adding Data Files Required for a Test

-It is advisable to make self-contained test scripts whenever possible, so as they could be used in environments where data files are not available. For that simple geometric objects and shapes can be created using DRAW commands in the test script itself.
+It is advisable to make self-contained test scripts whenever possible, so as they could be used in the  environments where data files are not available. For that simple geometric objects and shapes can be created using DRAW commands in the test script itself.

-If the test requires a data file, it should be put to directory listed in environment variable *CSF_TestDataPath*.
+If the test requires a data file, it should be put to the directory listed in environment variable *CSF_TestDataPath*.
 Alternatively, it can be put to subdirectory *data* of the test grid. 
 It is recommended to prefix the data file with the corresponding issue id prefixed by *bug*, e.g. *bug12345_face1.brep*, to avoid possible conflicts with names of existing data files. 

-Note that when the test is integrated to the master branch, OCC team will move the data file to data files repository, so as to keep OCCT sources repository clean from data files.
+Note that when the test is integrated to the master branch, OCC team will move the data file to the data files repository, to keep OCCT sources repository clean from data files.

-When preparing a test script, try to minimize the size of involved data model. For instance, if the problem detected on a big shape can be reproduced on a single face extracted from that shape, use only that face in the test.
+When you prepare a test script, try to minimize the size of involved data model. For instance, if the problem detected on a big shape can be reproduced on a single face extracted from that shape, use only that face in the test.


@subsection testmanual_3_3 Adding new DRAW commands
@@ -475,7 +474,7 @@ If the test cannot be implemented using available DRAW commands, consider the fo
 * Otherwise the new command implementing the actions needed for this particular test should be added in *QABugs* package. The command name should be formed by the Mantis issue ID prefixed by *bug*, e.g. *bug12345*.

 Note that a DRAW command is expected to return 0 in case of a normal completion, and 1 (Tcl exception) if it is incorrectly used (e.g. a wrong number of input arguments). Thus if the new command needs to report a test error, this should be done by outputting an appropriate error message rather than by returning a non-zero value.
-Also file names must not be encoded in DRAW command but in script, and passed to DRAW command as argument.
+File names must be encoded in the script rather than in the DRAW command and passed to the DRAW command as an argument.

@subsection testmanual_3_4 Script Implementation

@@ -522,13 +521,16 @@ stepread [locate_data_file CAROSKI_COUPELLE.step] a *
 ~~~~~

 When the test needs to produce some snapshots or other artefacts, use Tcl variable *imagedir* as the location where such files should be put. 
-Command *testgrid* sets this variable to the subdirectory of the results folder corresponding to the grid. 
-Command *test* by default creates dedicated temporary directory in the system temporary folder (normally the one specified by environment variable *TempDir*, *TEMP*, or *TMP*) for each execution, and sets *imagedir* to that location. 
-However if variable *imagedir* is defined on top level of Tcl interpretor, command *test* will use it instead of creating a new directory.
+* Command *testgrid* sets this variable to the subdirectory of the results folder corresponding to the grid. 
+* Command *test* by default creates a dedicated temporary directory in the system temporary folder (normally the one specified by environment variable *TempDir*, *TEMP*, or *TMP*) for each execution, and sets *imagedir* to that location. 
+
+However if variable *imagedir* is defined on the top level of Tcl interpretor, command *test* will use it instead of creating a new directory.

 Use Tcl variable *casename* to prefix all files produced by the test. 
 This variable is set to the name of the test case.
-For the image file (snapshot) to be recognized by the test system (for inclusion in HTML log and differences), its name should start with name of the test case (use variable *casename*), optionally followed by underscore or dash and arbitrary suffix.
+
+The test system can recognize an image file (snapshot) and include it in HTML log and differences if its name starts with the name of the test case (use variable *casename*), optionally followed by underscore or dash and arbitrary suffix.
+
 The image format (defined by extension) should be *png*.

 Example:
@@ -550,9 +552,9 @@ A1-front.png
 Note that OCCT must be built with FreeImage support to be able to produce usable images.

 Other Tcl variables defined during the test execution are:
- *groupname*: name of the test group
- *gridname*: name of the test grid
- *dirname*: path to the root directory of the current set of test scripts
+- *groupname*: name of the test group;
+- *gridname*: name of the test grid;
+- *dirname*: path to the root directory of the current set of test scripts.

 In order to ensure that the test works as expected in different environments, observe the following additional rules:
 * Avoid using external commands such as *grep, rm,* etc., as these commands can be absent on another system (e.g. on Windows); use facilities provided by Tcl instead.
@@ -576,7 +578,7 @@ The new test created for an unsolved problem should return BAD. The new test cre

@subsection testmanual_3_6 Marking BAD cases

-If the test produces an invalid result at a certain moment then corresponding bug should be created in the  OCCT issue tracker located at http://tracker.dev.opencascade.org, and the problem should be marked as TODO in the test script.
+If the test produces an invalid result at a certain moment then the corresponding bug should be created in the OCCT issue tracker located at http://tracker.dev.opencascade.org, and the problem should be marked as TODO in the test script.

 The following statement should be added to such a test script:
 ~~~~~
@@ -585,7 +587,7 @@ puts "TODO BugNumber ListOfPlatforms: RegularExpression"

 Here:
 * *BugNumber* is the bug ID in the tracker. For example: #12345.
-* *ListOfPlatforms* is a list of platforms at which the bug is reproduced (e.g. Mandriva2008, Windows or All). Note that the platform name is custom for the OCCT test system; it corresponds to the value of environment variable *os_type* defined in DRAW.
+* *ListOfPlatforms* is a list of platforms, at which the bug is reproduced (e.g. Mandriva2008, Windows or All). Note that the platform name is custom for the OCCT test system; it corresponds to the value of environment variable *os_type* defined in DRAW.

 Example:
 ~~~~~
@@ -593,7 +595,7 @@ Draw[2]> puts $env(os_type)
 windows
 ~~~~~

-* RegularExpression is a regular expression which should be matched against the line indicating the problem in the script output. 
+* RegularExpression is a regular expression, which should be matched against the line indicating the problem in the script output. 

 Example:
 ~~~~~
@@ -620,7 +622,7 @@ puts "TODO OCC22817 All: TEST INCOMPLETE"

@subsection testmanual_4_1 Running Tests on Older Versions of OCCT

-Sometimes it might be necessary to run tests on previous versions of OCCT (<= 6.5.4) that do not include this test system. This can be done by adding DRAW configuration file *DrawAppliInit* in the directory which is current by the moment of DRAW start-up, to load test commands and to define necessary environment.
+Sometimes it might be necessary to run tests on the previous versions of OCCT (<= 6.5.4) that do not include this test system. This can be done by adding DRAW configuration file *DrawAppliInit* in the directory, which is current by the moment of DRAW start-up, to load test commands and to define the necessary environment.

 Note: in OCCT 6.5.3, file *DrawAppliInit* already exists in <i>$CASROOT/src/DrawResources</i>, new commands should be added to this file instead of a new one in the current directory.

@@ -634,7 +636,7 @@ set env(CSF_TestDataPath) $env(CASROOT)/data;d:/test-data
 return
 ~~~~~

-Note that on older versions of OCCT the tests are run in compatibility mode and not all output of the test command can be captured; this can lead to absence of some error messages (can be reported as either a failure or an improvement).
+Note that on older versions of OCCT the tests are run in compatibility mode and thus not all output of the test command can be captured; this can lead to absence of some error messages (can be reported as either a failure or an improvement).

@subsection testmanual_4_2 Adding custom tests

--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -0,0 +1,57 @@
+Upgrade from older OCCT versions  {#occt_dev_guides__upgrade}
+================================
+
+@tableofcontents
+
+@section occt_upgrade_intro Introduction
+
+This document provides technical details on upgrading user applications using previous versions of OCCT, to the current one.
+
+@subsection occt_upgrade_700 Upgrade to OCCT 7.0.0
+
+@subsubsection occt_upgrade_700_persist Removal of legacy persistence
+
+Legacy persistence for shapes and OCAF data based on Storage_Schema (toolkits TKShapeShcema, TLStdLSchema, TKStdSchema, TKXCAFSchema) has been removed in OCCT 7.0.0.
+Applications that used these persistence tools for their data need to be updated to use other persistence mechanisms.
+
+The existing data files in standard formats can be converted using OCCT 6.9.0 or previous, as follows.
+
+#### CSFDB files
+
+Files in CSFDB format (usually with extension .csfdb) contain OCCT shape data that can be converted to BRep format. 
+The easiest way to do that is to use ImportExport sample provided with OCCT 6.9.0 (or earlier):
+
+- Start ImportExport sample
+- Select File / New
+- Select File / Import / CSFDB... and specify the file to be converted
+- Drag mouse with right button pressed across the view to select all shapes by rectangle
+- Select File / Export / BREP... and specify location and name for the resulting file
+
+#### OCAF and XCAF documents
+
+Files containing OCAF data saved in old format usually have extensions .std or .sgd or .dxc (XDE documents).
+These files can be converted to XML or binary OCAF formats using DRAW Test Harness commands available in OCCT 6.9.0 or earlier.
+
+For that, start *DRAWEXE* and perform the following commands: 
+
+  * for the conversion of the "*.std" and "*.sgd" file formats to the binary format "*.cbf" (Created document should be in **BinOcaf** format instead of **MDTV-Standard**):
+
+  @code
+  Draw[]> pload ALL
+  Draw[]> Open [path to *.std or *.sgd file] Doc
+  Draw[]> Format Doc BinOcaf
+  Draw[]> SaveAs Doc [path to the new file]
+  @endcode
+
+  * for the conversion of the "*.dxc" file format to the binary format "*.xbf" (Created document should be in **BinXCAF** format instead of **MDTV-XCAF**):
+
+  @code
+  Draw[]> pload ALL
+  Draw[]> XOpen [path to *.dxc file] Doc
+  Draw[]> Format Doc BinXCAF
+  Draw[]> XSave Doc [path to the new file]
+  @endcode
+
+On Windows, be careful to replace back slashes in the file path by either direct slash or pairs of back slashes.
+Use "XmlOcaf" or "XmlXCAF" instead of "BinOcaf" and "BinXCAF", respectively, to save in XML format instead of binary one.
+
--- a/dox/dev_guides/wok/wok.md
+++ b/dox/dev_guides/wok/wok.md
@@ -480,8 +480,11 @@ This automatically takes you to the root directory of the workbench

@subsubsection occt_wok_3_3_8  Using Existing Resources
 Before creating new data types, you should look for existing components that you can reuse. In particular, you should look through the existing resources of your Open CASCADE Technology platform to see if any of the required components already exist, or if any existing generic components can be suitably implemented. This search can be conducted using the online documentation. You should note the packages and classes, which you can reuse. 
+
@subsection occt_wok_3_4  Creating Software Components
+
@subsubsection occt_wok_3_4_1  Creating a Package
+
 To develop new software components, you usually need to create one or more packages. You do this, by using the following command: 
 ~~~~~
 > ucreate –p <MyPackage> 
@@ -613,6 +616,7 @@ The umake steps for development units of package type are explained below.
 * *obj.lib*     Generates the shared library for the development unit. 

@subsubsection occt_wok_3_4_2  Creating a Nocdlpack
+
 If your executable requires the use of a nocdlpack, create a development unit of nocdlpack type and move to its structure using the commands below: 
 ~~~~~
  > ucreate -n <MyNoCDLPack>
@@ -656,7 +660,8 @@ The *umake* steps for development units of *nocdlpack* type are explained below.
  + Implementation dependencies in terms of the unit suppliers. (Unit.ImplDep) 
 * *obj.lib*   Generates the shared library for the unit. 

-@subsubsection occt_wok_3_3_3  Creating a Schema
+@subsubsection occt_wok_3_4_3  Creating a Schema
+
 If the application, which you intend to build, stores data in a file, you need to define a schema for the persistent data types that are known. 

 You create a schema and go to its root directory using the commands: 
@@ -735,7 +740,9 @@ The umake steps for development units of schema type are explained below.
 * *obj.idep*   Generates dependency information for the schema. 

@subsection occt_wok_3_5  Building an Executable
+
@subsubsection occt_wok_3_5_1  Creating an Executable
+
 To make an executable from one or more of the packages, which you have created, write a .cdl file to specify the packages to use. 

 #### Writing an Executable
@@ -805,7 +812,9 @@ The umake steps for development units of executable type are explained below.
 * *exec.link* Links each part of the executable. 

@subsection occt_wok_3_6  Test Environments
-@subsubsection occt_wok_3_3_1  Testing an Executable
+
+@subsubsection occt_wok_3_6_1  Testing an Executable
+
 To test an executable, you create an executable development unit and move to its structure.

 When you write the .cdl file for your test executable, specify the packages to test, for example: 
--- a/dox/license.md
+++ b/dox/license.md
--- a/dox/overview/images/overview_3rdparty.png
+++ b/dox/overview/images/overview_3rdparty.png
--- a/dox/overview/images/overview_installation.png
+++ b/dox/overview/images/overview_installation.png
--- a/dox/overview/overview.md
+++ b/dox/overview/overview.md
@@ -20,7 +20,7 @@ http://www.opencascade.org
@section OCCT_OVW_SECTION_2 Copyrights

 Open CASCADE Technology and all materials, including this documentation, is 
-Copyright (c) 1999-2013 by OPEN CASCADE S.A.S. All rights reserved.
+Copyright (c) 1999-2015 by OPEN CASCADE S.A.S. All rights reserved.

@htmlonly<center>@endhtmlonly
 http://www.opencascade.com
@@ -168,7 +168,7 @@ See @ref occt_dev_guides__documentation "OCCT Documentation Guide" for details o
 **Generation of HTML documentation**

 To generate HTML documentation from sources contained in *dox* subdirectory, 
-you need to have Tcl and Doxygen 1.8.4 (or above) installed on your system.
+you need to have Tcl and Doxygen 1.8.5 (or above) installed on your system.

 In Tcl prompt, cd to OCCT root folder and run 

@@ -184,7 +184,7 @@ is available for download from www.opencascade.org and dev.opencascade.org sites

 Prerequisites:

-  * Doxygen version 1.8.4 or higher
+  * Doxygen version 1.8.5 or higher
  * Graphviz version 2.28.0 or higher

 Run WOK (cd \<WOK_INSTALL_DIR\>/site folder):
@@ -224,7 +224,7 @@ for which OCCT is certified to work.
 | Minimum memory    | 512 MB, 1 GB recommended |
 | Free disk space (complete installation) | 600 MB approx. |
 | Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
+| Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ |
 | C++      | GNU gcc 4.0.  - 4.7.3. |
 | TCL (for testing tools)    | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html |
 | Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
@@ -243,7 +243,7 @@ for which OCCT is certified to work.
 | Minimum memory    | 512 MB, 1 GB recommended |
 | Free disk space (complete installation) | 600 MB approx. |
 | Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
+| Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ |
 | C++ | Microsoft Visual Studio: 2005 SP1, 2008 SP1, 2010 SP1 \*, 2012 Update 3, 2013 <br>Intel C++ Composer XE 2013 SP1 |
 | TCL (for testing tools) | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html  |
 | Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
@@ -253,7 +253,7 @@ for which OCCT is certified to work.
 | Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
 | VTK (for VTK Integration Services | VTK 6.1.0 http://www.vtk.org/VTK/resources/software.html |

-* VC++ 10 32-bit is used for certification of contributions and for building 
+* VC++ 10 64-bit is used for certification of contributions and for building 
  binary package of official release of OCCT on Windows.

@subsection OCCT_OVW_SECTION_5_3 MAC OS X
@@ -331,14 +331,14 @@ OCCT installation with reference documentation requires 1,4 Gb on disk.
  * Launch the installer and follow the instructions.

 The includes and binaries of third-party libraries necessary for building and launching 
-OCCT are included into binary distribution (built with Visual C++ 2008). 
+OCCT are included into binary distribution (built with Visual C++ 2010). 
 When the installation is complete, you will find the directories for 3rd party products 
 (some might be absent in case of custom installation) and the main **OCCT** directory:

@image html /overview/images/overview_3rdparty.png 
@image latex /overview/images/overview_3rdparty.png 

-The contents of the OCCT-6.8.0 directory (called further "OCCT root", or $CASROOT) are as follows:
+The contents of the OCCT-6.9.0 directory (called further "OCCT root", or $CASROOT) are as follows:

@image html /overview/images/overview_installation.png "The directory tree"
@image latex /overview/images/overview_installation.png "The directory tree"
@@ -354,7 +354,7 @@ The contents of the OCCT-6.8.0 directory (called further "OCCT root", or $CASROO
  * **samples**  This folder contains sample applications.
  * **src**  This folder contains OCCT source files. They are organized in folders, one per development unit;
  * **tests**  This folder contains scripts for OCCT testing.
-  * **win32/vc10**  This folder contains executable and library files built in optimize mode for Windows platform by Visual C++  2010;
+  * **win64/vc10**  This folder contains executable and library files built in optimize mode for Windows platform by Visual C++  2010;

@section OCCT_OVW_SECTION_4_2 Environment Variables

--- a/dox/resources/overview.html
+++ b/dox/resources/overview.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+    <meta http-equiv="refresh" content="0;URL=doc/overview/html/index.html">
+  </head>
+  <body>
+  </body>
+</html>
--- a/dox/technical_overview/images/0001.png
+++ b/dox/technical_overview/images/0001.png
--- a/dox/technical_overview/images/0002.png
+++ b/dox/technical_overview/images/0002.png
--- a/dox/technical_overview/images/0003.png
+++ b/dox/technical_overview/images/0003.png
--- a/dox/technical_overview/images/0004.png
+++ b/dox/technical_overview/images/0004.png
--- a/dox/technical_overview/images/0008.png
+++ b/dox/technical_overview/images/0008.png
--- a/dox/technical_overview/images/0012.png
+++ b/dox/technical_overview/images/0012.png
--- a/dox/technical_overview/images/0013.png
+++ b/dox/technical_overview/images/0013.png
--- a/dox/technical_overview/images/0014.png
+++ b/dox/technical_overview/images/0014.png
--- a/dox/technical_overview/images/239_xde_12_400.png
+++ b/dox/technical_overview/images/239_xde_12_400.png
--- a/dox/technical_overview/images/610_xde_01_400.png
+++ b/dox/technical_overview/images/610_xde_01_400.png
--- a/dox/technical_overview/images/614_xde_04_400.png
+++ b/dox/technical_overview/images/614_xde_04_400.png
--- a/dox/technical_overview/images/642_sh_08_400.png
+++ b/dox/technical_overview/images/642_sh_08_400.png
--- a/dox/technical_overview/images/644_sh_09_400.png
+++ b/dox/technical_overview/images/644_sh_09_400.png
--- a/dox/technical_overview/images/646_xde_11_400.png
+++ b/dox/technical_overview/images/646_xde_11_400.png
--- a/dox/technical_overview/images/technical_overview_buildingmodules.png
+++ b/dox/technical_overview/images/technical_overview_buildingmodules.png
--- a/dox/technical_overview/images/technical_overview_de.png
+++ b/dox/technical_overview/images/technical_overview_de.png
--- a/dox/technical_overview/images/technical_overview_ma.png
+++ b/dox/technical_overview/images/technical_overview_ma.png
--- a/dox/technical_overview/images/technical_overview_md.png
+++ b/dox/technical_overview/images/technical_overview_md.png
--- a/dox/technical_overview/images/technical_overview_occ_0005.png
+++ b/dox/technical_overview/images/technical_overview_occ_0005.png
--- a/Show More
+++ b/Show More