diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-17 12:07:48 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:08 +0100 |
| commit | a81cddb3b2bc2848111eb3781c26acdab7baf628 (patch) | |
| tree | 9e5ab1f7bd2601654e5dc1eca1ce6f497e4588fd /external | |
| parent | a8b73758e723656173aebaaa9d94926b03ca01d4 (diff) | |
use the same config file for skia build and using it
So that the setup is consistent.
Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac
Diffstat (limited to 'external')
| -rw-r--r-- | external/skia/Library_skia.mk | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index cc3856114d93..8f21787cfd0f 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -15,39 +15,13 @@ $(eval $(call gb_Library_use_unpacked,skia,skia)) $(eval $(call gb_Library_set_precompiled_header,skia,external/skia/inc/pch/precompiled_skia)) -# TODO SKIA $(eval $(call gb_Library_add_defs,skia,\ - -DSK_SUPPORT_GPU=1 \ - -DSKIA_DLL \ -DSKIA_IMPLEMENTATION=1 \ - -DSK_GL=1 \ - -DSK_VULKAN=1 \ - -DSK_HAS_JPEG_LIBRARY=1 \ - -DSK_HAS_PNG_LIBRARY=1 \ - -DSK_GAMMA_APPLY_TO_A8 \ - -DSK_ASSUME_GL=1 \ - -DSK_ASSUME_GL_ES=0 \ + -DSKIA_DLL \ + -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ )) -ifneq (,$(gb_ENABLE_DBGUTIL)) -$(eval $(call gb_Library_add_defs,skia,\ - -DSK_DEBUG \ - -DSK_ENABLE_DUMP_GPU \ -)) -else -$(eval $(call gb_Library_add_defs,skia,\ - -DSK_RELEASE \ - -DNDEBUG \ -)) -endif - ifeq ($(OS),WNT) -# TODO SKIA -$(eval $(call gb_Library_add_defs,skia,\ - -DSK_BUILD_FOR_WIN \ - -DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSSE3 \ -)) - $(eval $(call gb_Library_add_cxxflags,skia, \ -arch:SSE2 \ )) @@ -67,11 +41,6 @@ $(eval $(call gb_Library_use_system_win32_libs,skia,\ gdi32 \ )) else -$(eval $(call gb_Library_add_defs,skia,\ - -DSK_BUILD_FOR_UNIX \ - -DSK_R32_SHIFT=16 \ -)) - # TODO SKIA $(eval $(call gb_Library_add_cxxflags,skia, \ -mssse3 \ |