diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 9182f223eb93..d580ff3d2f6a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -94,20 +94,6 @@ $(eval $(call gb_Library_use_externals,vcl,\ mdds_headers \ )) -# WASM LLVM doesn't support native EH + SjLj (setjump / longjump) used by libjpeg / libpng. -# This otherwise breaks the PCH generation, so just move the files for that case. -ifeq (EMSCRIPTEN_TRUE,$(OS)_$(ENABLE_WASM_EXCEPTIONS)) -$(eval $(call gb_Library_add_cxxobjects,vcl,\ - vcl/source/filter/jpeg/jpegc \ - vcl/source/filter/png/PngImageReader \ -)) -else -$(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/source/filter/jpeg/jpegc \ - vcl/source/filter/png/PngImageReader \ -)) -endif - $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/rendercontext/drawmode \ vcl/skia/SkiaHelper \ @@ -474,6 +460,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/filter/ixpm/xpmread \ vcl/source/filter/jpeg/Exif \ vcl/source/filter/jpeg/jpeg \ + vcl/source/filter/jpeg/jpegc \ vcl/source/filter/jpeg/JpegReader \ vcl/source/filter/jpeg/JpegWriter \ vcl/source/filter/jpeg/JpegTransform \ @@ -484,6 +471,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/filter/wmf/wmf \ vcl/source/filter/wmf/wmfexternal \ vcl/source/filter/wmf/wmfwr \ + vcl/source/filter/png/PngImageReader \ vcl/source/filter/png/pngwrite \ vcl/source/filter/webp/reader \ vcl/source/filter/webp/writer \ |