diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-28 19:45:12 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-31 22:49:30 +0200 |
| commit | 7b3f37f885a46e855f8cb16a4106e9c1fdd5c4fe (patch) | |
| tree | 12adde462fd7286904172b8e6896f597917949ac /vcl/Library_vcl.mk | |
| parent | afd5eb1f04971edb083e47a2f9c2e9d77c9737c9 (diff) | |
vcl: use CustomTarget makefiles
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b8863899c8b1..730fdd5b3568 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -43,14 +43,13 @@ $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) endif $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) -$(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash)) + +$(eval $(call gb_Library_add_custom_headers,vcl,vcl/generic/fontmanager)) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/solenv/inc \ $(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \ - -I$(WORKDIR)/CustomTarget/vcl/generic/fontmanager \ )) $(eval $(call gb_Library_add_defs,vcl,\ @@ -451,9 +450,6 @@ $(eval $(call gb_Library_use_externals,vcl,\ endif ifeq ($(GUIBASE),headless) -$(eval $(call gb_Library_add_cxxflags,vcl,\ - $$(FREETYPE_CFLAGS) \ -)) $(eval $(call gb_Library_add_defs,vcl,\ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ |