diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-06-25 10:35:00 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-06-25 16:16:49 +0200 |
| commit | 2eeb6822110205f76eb908b5900526723cc8007c (patch) | |
| tree | 87e59aa1682217154cbeea48203e125bdf146b5f /external/skia | |
| parent | sd signature line: pass the model down to xmlsecurity (diff) | |
| download | core-2eeb6822110205f76eb908b5900526723cc8007c.tar.gz core-2eeb6822110205f76eb908b5900526723cc8007c.zip | |
log properly the compiler used to compile Skia
Using #define's directly from VCL will report the compiler used
to compile VCL, which may be different from the one used for Skia.
Also truncate the log file on opening.
Change-Id: Iddf613613df20505f1abe1dd5468dcc8c7041410
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97090
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'external/skia')
| -rw-r--r-- | external/skia/Library_skia.mk | 2 | ||||
| -rw-r--r-- | external/skia/inc/skia_compiler.hxx | 13 | ||||
| -rw-r--r-- | external/skia/source/skia_compiler.cxx | 20 |
3 files changed, 35 insertions, 0 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 62fdeffed46e..47140da4e50e 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -85,10 +85,12 @@ $(eval $(call gb_Library_set_include,skia,\ -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/skcms/ \ -I$(call gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \ -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan/ \ + -I$(SRCDIR)/external/skia/inc/ \ )) $(eval $(call gb_Library_add_exception_objects,skia,\ external/skia/source/SkMemory_malloc \ + external/skia/source/skia_compiler \ )) $(eval $(call gb_Library_set_generated_cxx_suffix,skia,cpp)) diff --git a/external/skia/inc/skia_compiler.hxx b/external/skia/inc/skia_compiler.hxx new file mode 100644 index 000000000000..a26ec29bdd1e --- /dev/null +++ b/external/skia/inc/skia_compiler.hxx @@ -0,0 +1,13 @@ +/* + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SKIA_COMPILER_H +#define SKIA_COMPILER_H + +#include <include/core/SkTypes.h> + +SK_API const char* skia_compiler_name(); + +#endif diff --git a/external/skia/source/skia_compiler.cxx b/external/skia/source/skia_compiler.cxx new file mode 100644 index 000000000000..6339a4a4f900 --- /dev/null +++ b/external/skia/source/skia_compiler.cxx @@ -0,0 +1,20 @@ +/* + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include <skia_compiler.hxx> + +// Get the type of compiler that Skia is compiled with. +const char* skia_compiler_name() +{ +#if defined __clang__ + return "Clang"; +#elif defined __GNUC__ + return "GCC"; +#elif defined _MSC_VER + return "MSVC"; +#else + return "?"; +#endif +} |