use the same config file for skia build and using it

So that the setup is consistent.

Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac

5 files changed, 60 insertions, 38 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b2a4ef548163..08ae4da20179 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -114,15 +114,20 @@ endif
 ifneq ($(ENABLE_SKIA),)
 define gb_LinkTarget__use_skia
 $(call gb_LinkTarget_set_include,$(1),\
-       -I$(call gb_UnpackedTarball_get_dir,skia)/include/core \
-       -I$(call gb_UnpackedTarball_get_dir,skia)/include/config \
-       -I$(call gb_UnpackedTarball_get_dir,skia) \
-       $$(INCLUDE) \
+	-I$(call gb_UnpackedTarball_get_dir,skia)/include/core \
+	-I$(call gb_UnpackedTarball_get_dir,skia)/include/config \
+	-I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan \
+	-I$(call gb_UnpackedTarball_get_dir,skia) \
+	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_libraries,$(1),skia)
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \
+	-DSKIA_DLL \
+)
 endef
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
-       skia \
+        skia \
 ))
 endif
 
diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
new file mode 100644
index 000000000000..75b1e099ce8e
--- /dev/null
+++ b/config_host/config_skia.h.in
@@ -0,0 +1,45 @@
+/*
+
+Settings for the Skia library. We compile the Skia library with these
+settings and also LO code uses this header to ensure the settings
+are the same.
+*/
+
+#ifndef CONFIG_SKIA_H
+#define CONFIG_SKIA_H
+
+/* TODO SKIA check all these */
+
+#define SK_SUPPORT_GPU 1
+
+#define SK_GL 1
+
+#define SK_VULKAN 1
+
+#define SK_HAS_JPEG_LIBRARY 1
+
+#define SK_HAS_PNG_LIBRARY 1
+
+#define SK_GAMMA_APPLY_TO_A8
+
+#define SK_ASSUME_GL 1
+
+#define SK_ASSUME_GL_ES 0
+
+
+#ifdef DBG_UTIL
+
+#define SK_DEBUG
+
+#define SK_ENABLE_DUMP_GPU
+
+#else
+
+#define DSK_RELEASE
+
+#endif // DBG_UTIL
+
+// TODO ?
+//#define SK_R32_SHIFT 16
+
+#endif
diff --git a/configure.ac b/configure.ac
index 87f3d7d3dd38..6e7e3335d1fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12916,6 +12916,7 @@ AC_CONFIG_HEADERS([config_host/config_mpl.h])
 AC_CONFIG_HEADERS([config_host/config_oox.h])
 AC_CONFIG_HEADERS([config_host/config_options.h])
 AC_CONFIG_HEADERS([config_host/config_options_calc.h])
+AC_CONFIG_HEADERS([config_host/config_skia.h])
 AC_CONFIG_HEADERS([config_host/config_typesizes.h])
 AC_CONFIG_HEADERS([config_host/config_vendor.h])
 AC_CONFIG_HEADERS([config_host/config_vcl.h])
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 \
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 1da101b31a4b..77c07e65e2a4 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -140,6 +140,8 @@ gb_PrecompiledHeader_ignore_flags_system := \
 -DDISABLE_CVE_TESTS \
 -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' \
 -DOOO_DLLIMPLEMENTATION_TEST \
+-DSK_USER_CONFIG_HEADER=% \
+-DSKIA_DLL \
 -include $(SRCDIR)/pch/inc/clangfix.hxx \
 
 # Probably also update pch/inc/clangfix.hxx if you extend the list.