diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-01 18:53:40 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-01 22:08:09 +0200 |
commit | 017bc462b0af467ca89653266674302a9821db5e (patch) | |
tree | 34eab3f1f411637268d5956795d5ddc84bd161f0 /external | |
parent | b3a56273a388c44d0fcf0aff0d06b5414f2e3397 (diff) |
cairo: Drop config for WNT and MACOSX build
It's not used on these platforms since a long time.
Change-Id: Idac41f1be0a546fd8aa0dd88709ebfa3255a104e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116555
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external')
-rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 14 | ||||
-rw-r--r-- | external/cairo/ExternalProject_pixman.mk | 13 | ||||
-rw-r--r-- | external/cairo/UnpackedTarball_pixman.mk | 4 | ||||
-rw-r--r-- | external/cairo/pixman/Makefile.win32.common | 54 | ||||
-rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 10 |
5 files changed, 0 insertions, 95 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 471ae6104361..efb9a2023546 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -26,18 +26,6 @@ $(eval $(call gb_ExternalProject_register_targets,cairo,\ build \ )) -ifeq ($(OS),WNT) - -$(call gb_ExternalProject_get_state_target,cairo,build) : - $(call gb_Trace_StartRange,cairo,EXTERNAL) - $(call gb_ExternalProject_run,build,\ - $(MAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=zlib.lib \ - ) - $(call gb_Trace_EndRange,cairo,EXTERNAL) - - -else - # Including -rtlib=compiler-rt in pixman_LIBS is a BAD HACK: At least when compiling with Clang # -fsanitize=undefined on Linux x86-64, the generated code references __muloti4, which is an # extension provided by libclang_rt.builtins-x86_64.a runtime, but not by GCC's libgcc_s.so.1 (which @@ -98,6 +86,4 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ) $(call gb_Trace_EndRange,cairo,EXTERNAL) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index 03dffbd01312..4ecbd0b67416 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -13,17 +13,6 @@ $(eval $(call gb_ExternalProject_register_targets,pixman,\ build \ )) -ifeq ($(OS),WNT) - -$(call gb_ExternalProject_get_state_target,pixman,build) : - $(call gb_Trace_StartRange,pixman,EXTERNAL) - $(call gb_ExternalProject_run,build,\ - $(MAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release \ - ,pixman) - $(call gb_Trace_EndRange,pixman,EXTERNAL) - -else - # ANDROID: # The pixman-cpu.c code wants to read /proc/<pid>/auxv, but # the Android headers don't define Elf32_auxv_t. @@ -44,6 +33,4 @@ $(call gb_ExternalProject_get_state_target,pixman,build) : ) $(call gb_Trace_EndRange,pixman,EXTERNAL) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk index cc3dbd11dcc0..bccc7a7a5a04 100644 --- a/external/cairo/UnpackedTarball_pixman.mk +++ b/external/cairo/UnpackedTarball_pixman.mk @@ -17,8 +17,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,pixman,\ external/cairo/pixman/pixman-ubsan.patch \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_UnpackedTarball_add_file,pixman,pixman,external/cairo/pixman/Makefile.win32.common)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/cairo/pixman/Makefile.win32.common b/external/cairo/pixman/Makefile.win32.common deleted file mode 100644 index 30b94e7b1ea3..000000000000 --- a/external/cairo/pixman/Makefile.win32.common +++ /dev/null @@ -1,54 +0,0 @@ -LIBRARY = pixman-1 - -CC = cl -LD = link -AR = lib -PERL = perl - -ifeq ($(top_builddir),) -top_builddir = $(top_srcdir) -endif - -CFG_VAR = $(CFG) -ifeq ($(CFG_VAR),) -CFG_VAR = release -endif - -ifeq ($(CFG_VAR),debug) -CFG_CFLAGS = -MD -Od -Zi -CFG_LDFLAGS = -DEBUG -else -CFG_CFLAGS = -MD -O2 -CFG_LDFLAGS = -endif - -# Package definitions, to be used instead of those provided in config.h -PKG_CFLAGS = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT="" - -BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman - -PIXMAN_CFLAGS = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS) -PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS) -PIXMAN_ARFLAGS = -nologo $(LDFLAGS) - - -inform: -ifneq ($(CFG),release) -ifneq ($(CFG),debug) -ifneq ($(CFG),) - @echo "Invalid specified configuration option: "$(CFG)"." - @echo - @echo "Possible choices for configuration are 'release' and 'debug'" - @exit 1 -endif - @echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)" -endif -endif - - -$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES) - @mkdir -p $(CFG_VAR) - @$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $< - -clean: inform - @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0 diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 8b49abbab13a..c4d55960c6ca 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -13,15 +13,6 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\ build \ )) -ifeq ($(OS),WNT) -$(call gb_ExternalProject_get_state_target,freetype,build) : - $(call gb_Trace_StartRange,freetype,EXTERNAL) - $(call gb_ExternalProject_run,build,\ - cd ../builds/win32/vc2010/ && \ - msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - ,objs) - $(call gb_Trace_EndRange,freetype,EXTERNAL) -else $(call gb_ExternalProject_get_state_target,freetype,build) : $(call gb_Trace_StartRange,freetype,EXTERNAL) $(call gb_ExternalProject_run,build,\ @@ -36,6 +27,5 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : && $(MAKE) install \ && touch $@ ) $(call gb_Trace_EndRange,freetype,EXTERNAL) -endif # vim: set noet sw=4 ts=4: |