From: apn Date: Mon, 18 Feb 2019 11:59:32 +0000 (+0300) Subject: 0030498: Warnings of building documentation X-Git-Tag: V7_4_0_beta~245 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=78d5ea7a7141e6583e8526e43cce3e50001a6184 0030498: Warnings of building documentation Fix warning 'Reached end of file while still insided a (nested) comment in Markdown' for old versions of doxygen --- diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md index 641bc8df98..0b9cdf84a1 100644 --- a/dox/dev_guides/upgrade/upgrade.md +++ b/dox/dev_guides/upgrade/upgrade.md @@ -1091,7 +1091,7 @@ The following environment variables have become redundant: * *CSF_UnitsLexicon* and *CSF_UnitsDefinition* are no more used. Units definition (*UnitsAPI/Lexi_Expr.dat* and *UnitsAPI/Units.dat*) is now embedded into source code. * *CSF_XSMessage* and *CSF_XHMessage* are now optional. - English messages (XSMessage/*XSTEP.us* and SHMessage/*SHAPE.us*) are now embedded into source code + English messages (XSMessage/\*XSTEP.us* and SHMessage/\*SHAPE.us*) are now embedded into source code and automatically loaded when environment variables are not set. * *CSF_ShadersDirectory* is not required any more, though it still can be used to load custom shaders. Mandatory GLSL resources are now embedded into source code. diff --git a/samples/qt/AndroidQt/ReadMe.md b/samples/qt/AndroidQt/ReadMe.md index 8a0b39197a..bfdafc5806 100644 --- a/samples/qt/AndroidQt/ReadMe.md +++ b/samples/qt/AndroidQt/ReadMe.md @@ -14,9 +14,9 @@ Requirements for building sample: * Android NDK r9d or newer * Apache Ant 1.9.4 or higher * OCCT compiled under Android platform and placed in directories: - * occt/libs/armeabi-v7a/*.so and occt/inc/*.hxx (libraries and include files of OCCT install) - * android/assets/opencascade/shared/Shaders/* (Shaders folder of OCCT install: /share/opencascade/resources/Shaders) - * 3rdparty/include/freetype2/*, 3rdparty/include/FreeImage.h and 3rdparty/libs/armeabi-v7a/libFreeImage.so and 3rdparty/libs/armeabi-v7a/libfreetype.so + * occt/libs/armeabi-v7a/\*.so and occt/inc/\*.hxx (libraries and include files of OCCT install) + * android/assets/opencascade/shared/Shaders/\* (Shaders folder of OCCT install: /share/opencascade/resources/Shaders) + * 3rdparty/include/freetype2/\*, 3rdparty/include/FreeImage.h and 3rdparty/libs/armeabi-v7a/libFreeImage.so and 3rdparty/libs/armeabi-v7a/libfreetype.so It is also possible to to correct OCCT.pri file an get resources from another tree of directories.