diff --git a/adm/genconfdeps.tcl b/adm/genconfdeps.tcl index 189613f170..1ffb65afdb 100644 --- a/adm/genconfdeps.tcl +++ b/adm/genconfdeps.tcl @@ -1251,13 +1251,13 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64 return "$isFound" } - set aXmuLibPath [wokdep:SearchLib "Xmu" "$::ARCH"] - if { "$aXmuLibPath" == "" } { - set aXmuLibPath [wokdep:SearchLib "Xmu" "$::ARCH" "/usr/X11/lib"] - if { "$aXmuLibPath" != "" } { + set aX11LibPath [wokdep:SearchLib "X11" "$::ARCH"] + if { "$aX11LibPath" == "" } { + set aX11LibPath [wokdep:SearchLib "X11" "$::ARCH" "/usr/X11/lib"] + if { "$aX11LibPath" != "" } { #lappend ::CSF_OPT_LIB$::ARCH "/usr/X11/lib" } else { - lappend anErrLib$::ARCH "Error: '${::SYS_LIB_PREFIX}Xmu.${::SYS_LIB_SUFFIX}' not found (X11)" + lappend anErrLib$::ARCH "Error: '${::SYS_LIB_PREFIX}X11.${::SYS_LIB_SUFFIX}' not found (X11)" set isFound "false" } } diff --git a/adm/qmake/OccToolkit.pri b/adm/qmake/OccToolkit.pri index ca33ca051f..9bc54d1cdb 100644 --- a/adm/qmake/OccToolkit.pri +++ b/adm/qmake/OccToolkit.pri @@ -26,6 +26,7 @@ HAVE_FFMPEG { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil } HAVE_TBB { CSF_TBB = -ltbb -ltbbmalloc } HAVE_ZLIB { CSF_ZLIB = -lzlib } HAVE_LIBLZMA { CSF_LIBLZMA = -lliblzma } +HAVE_DRACO { CSF_Draco = -ldraco } win32 { CSF_kernel32 = -lkernel32 CSF_advapi32 = -ladvapi32 diff --git a/dox/build/build_3rdparty/building_3rdparty.md b/dox/build/build_3rdparty/building_3rdparty.md index 8bc15f6c5b..eaf038b7a6 100644 --- a/dox/build/build_3rdparty/building_3rdparty.md +++ b/dox/build/build_3rdparty/building_3rdparty.md @@ -272,7 +272,8 @@ There are two types of third-party products, which are necessary to build OCCT: All 3rd-party products required for building of OCCT could be installed from official repositories. You may install them from console using apt-get utility: - sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libx11-dev libgl1-mesa-dev libfreeimage-dev rapidjson-dev + sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libx11-dev libgl1-mesa-dev libfreeimage-dev + sudo apt-get install rapidjson-dev libdraco-dev Building is possible with C++ compliant compiler: