diff options
Diffstat (limited to 'vcl/Library_vcl.mk')
-rw-r--r-- | vcl/Library_vcl.mk | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 1ff33396ae6a..469aa5e65b03 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -99,9 +99,6 @@ $(eval $(call gb_Library_use_externals,vcl,\ lcms2 \ )) -$(eval $(call gb_Library_add_cobjects,vcl,\ - vcl/source/fontsubset/list \ -)) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/app/brand \ vcl/source/app/dbggui \ @@ -159,6 +156,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/fontsubset/cff \ vcl/source/fontsubset/fontsubset \ vcl/source/fontsubset/gsub \ + vcl/source/fontsubset/list \ vcl/source/fontsubset/sft \ vcl/source/fontsubset/ttcr \ vcl/source/fontsubset/xlat \ @@ -221,13 +219,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/print \ vcl/source/gdi/regband \ vcl/source/gdi/region \ - vcl/source/gdi/rendergraphic \ - vcl/source/gdi/rendergraphicrasterizer \ vcl/source/gdi/salgdilayout \ vcl/source/gdi/sallayout \ vcl/source/gdi/salmisc \ vcl/source/gdi/salnativewidgets-none \ - vcl/source/gdi/svgread \ + vcl/source/gdi/svgdata \ vcl/source/gdi/temporaryfonts \ vcl/source/gdi/textlayout \ vcl/source/gdi/virdev \ @@ -289,7 +285,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ # optional parts ## handle Graphite -ifneq ($(ENABLE_GRAPHITE),) +ifeq ($(ENABLE_GRAPHITE),TRUE) # add defines, graphite sources for all platforms $(eval $(call gb_Library_add_defs,vcl,\ -DENABLE_GRAPHITE \ @@ -315,19 +311,6 @@ $(eval $(call gb_Library_use_external,vcl,graphite)) endif -ifneq ($(ENABLE_LIBRSVG),NO) -$(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/source/components/rasterizer_rsvg \ -)) - -$(eval $(call gb_Library_add_defs,vcl,\ - -DENABLE_LIBRSVG \ -)) - -$(eval $(call gb_Library_use_external,vcl,cairo)) - -endif - $(eval $(call gb_Library_use_packages,vcl,\ basebmp_inc \ )) @@ -644,7 +627,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ imm32 \ mpr \ msimg32 \ - oldnames \ ole32 \ shell32 \ usp10 \ @@ -655,11 +637,13 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ $(eval $(call gb_Library_add_nativeres,vcl,vcl/src)) ifeq ($(COM),MSC) +ifeq ($(USE_MINGW),) $(eval $(call gb_Library_add_ldflags,vcl,\ /ENTRY:LibMain@12 \ )) endif endif +endif ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vcl,\ |