diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-06-18 14:42:37 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2023-08-30 10:54:46 -0400 |
commit | 72c4245b2e4127883c71f0970b71f4dc93829e41 (patch) | |
tree | 25129ffd1802b477652c28ff1daaa196b00f9339 | |
parent | 55eb680a1fcba7e5b877fb78365287c56209a3da (diff) |
delete win32 make files
meson can handle building for win32 (including using visual studio, and
mingw), and does a good deal more than these could. Since we're dropping
autotools, we might as well drop these too.
-rw-r--r-- | .editorconfig | 3 | ||||
-rw-r--r-- | Makefile.win32 | 25 | ||||
-rw-r--r-- | Makefile.win32.common | 73 | ||||
-rw-r--r-- | pixman/Makefile.sources | 43 | ||||
-rw-r--r-- | pixman/Makefile.win32 | 93 | ||||
-rw-r--r-- | test/Makefile.sources | 56 | ||||
-rw-r--r-- | test/Makefile.win32 | 61 |
7 files changed, 0 insertions, 354 deletions
diff --git a/.editorconfig b/.editorconfig index b98bc65..5153bb0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,9 +6,6 @@ root = true [*] tab_width = 8 -[Makefile.*] -indent_style = tab - [meson.build,meson_options.txt] indent_style = space indent_size = 2 diff --git a/Makefile.win32 b/Makefile.win32 deleted file mode 100644 index c3ca3bc..0000000 --- a/Makefile.win32 +++ /dev/null @@ -1,25 +0,0 @@ -default: all - -top_srcdir = . -include $(top_srcdir)/Makefile.win32.common - -all: pixman test - -pixman: - @$(MAKE) -C pixman -f Makefile.win32 - -test: - @$(MAKE) -C test -f Makefile.win32 - -clean_r: - @$(MAKE) -C pixman -f Makefile.win32 clean - @$(MAKE) -C test -f Makefile.win32 clean - -check: - @$(MAKE) -C test -f Makefile.win32 check - - -clean: clean_r - - -.PHONY: all pixman test clean check diff --git a/Makefile.win32.common b/Makefile.win32.common deleted file mode 100644 index 1b2f894..0000000 --- a/Makefile.win32.common +++ /dev/null @@ -1,73 +0,0 @@ -LIBRARY = pixman-1 - -ifeq ($(shell echo ""),) -# POSIX style shell -mkdir_p = mkdir -p $1 -rm = $(RM) $1 -echo = echo "$1" -else -# DOS/Windows style shell -mkdir_p = if not exist $(subst /,\,$1) md $(subst /,\,$1) -echo = echo $1 -rm = del $(subst /,\,$1) -endif - -CC = cl -LD = link -AR = lib -PERL = perl - -ifneq ($(shell echo ""),) -RM = del -endif - -ifeq ($(top_builddir),) -top_builddir = $(top_srcdir) -endif - -CFG_VAR = $(CFG) -ifeq ($(CFG_VAR),) -CFG_VAR = release -endif - -ifeq ($(CFG_VAR),debug) -CFG_CFLAGS = -MDd -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): - @$(call mkdir_p,$@) - -$(CFG_VAR)/%.obj: %.c $(libpixman_headers) | $(CFG_VAR) - $(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $< - -clean: inform $(CFG_VAR) - -$(call rm,$(CFG_VAR)/*.exe $(CFG_VAR)/*.ilk $(CFG_VAR)/*.lib $(CFG_VAR)/*.obj $(CFG_VAR)/*.pdb) - -.PHONY: inform clean diff --git a/pixman/Makefile.sources b/pixman/Makefile.sources deleted file mode 100644 index 23d1d97..0000000 --- a/pixman/Makefile.sources +++ /dev/null @@ -1,43 +0,0 @@ -libpixman_sources = \ - pixman.c \ - pixman-access.c \ - pixman-access-accessors.c \ - pixman-bits-image.c \ - pixman-combine32.c \ - pixman-combine-float.c \ - pixman-conical-gradient.c \ - pixman-filter.c \ - pixman-x86.c \ - pixman-mips.c \ - pixman-arm.c \ - pixman-ppc.c \ - pixman-edge.c \ - pixman-edge-accessors.c \ - pixman-fast-path.c \ - pixman-glyph.c \ - pixman-general.c \ - pixman-gradient-walker.c \ - pixman-image.c \ - pixman-implementation.c \ - pixman-linear-gradient.c \ - pixman-matrix.c \ - pixman-noop.c \ - pixman-radial-gradient.c \ - pixman-region16.c \ - pixman-region32.c \ - pixman-solid-fill.c \ - pixman-timer.c \ - pixman-trap.c \ - pixman-utils.c \ - $(NULL) - -libpixman_headers = \ - dither/blue-noise-64x64.h \ - pixman.h \ - pixman-accessor.h \ - pixman-combine32.h \ - pixman-compiler.h \ - pixman-edge-imp.h \ - pixman-inlines.h \ - pixman-private.h \ - $(NULL) diff --git a/pixman/Makefile.win32 b/pixman/Makefile.win32 deleted file mode 100644 index 7b64033..0000000 --- a/pixman/Makefile.win32 +++ /dev/null @@ -1,93 +0,0 @@ -default: all - -top_srcdir = .. -include $(top_srcdir)/pixman/Makefile.sources -include $(top_srcdir)/Makefile.win32.common - -MMX_VAR = $(MMX) -ifeq ($(MMX_VAR),) -MMX_VAR=on -endif - -SSE2_VAR = $(SSE2) -ifeq ($(SSE2_VAR),) -SSE2_VAR=on -endif - -SSSE3_VAR = $(SSSE3) -ifeq ($(SSSE3_VAR),) -SSSE3_VAR=on -endif - -MMX_CFLAGS = -DUSE_X86_MMX -w14710 -w14714 -SSE2_CFLAGS = -DUSE_SSE2 -SSSE3_CFLAGS = -DUSE_SSSE3 - -# MMX compilation flags -ifeq ($(MMX_VAR),on) -PIXMAN_CFLAGS += $(MMX_CFLAGS) -libpixman_sources += pixman-mmx.c -endif - -# SSE2 compilation flags -ifeq ($(SSE2_VAR),on) -PIXMAN_CFLAGS += $(SSE2_CFLAGS) -libpixman_sources += pixman-sse2.c -endif - -# SSSE3 compilation flags -ifeq ($(SSSE3_VAR),on) -PIXMAN_CFLAGS += $(SSSE3_CFLAGS) -libpixman_sources += pixman-ssse3.c -endif - -OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(libpixman_sources)) - -# targets -all: inform informMMX informSSE2 informSSSE3 $(CFG_VAR)/$(LIBRARY).lib - -informMMX: -ifneq ($(MMX),off) -ifneq ($(MMX),on) -ifneq ($(MMX),) - @echo "Invalid specified MMX option : "$(MMX_VAR)"." - @echo - @echo "Possible choices for MMX are 'on' or 'off'" - @exit 1 -endif - @echo "Setting MMX flag to default value 'on'... (use MMX=on or MMX=off)" -endif -endif - -informSSE2: -ifneq ($(SSE2),off) -ifneq ($(SSE2),on) -ifneq ($(SSE2),) - @echo "Invalid specified SSE option : "$(SSE2)"." - @echo - @echo "Possible choices for SSE2 are 'on' or 'off'" - @exit 1 -endif - @echo "Setting SSE2 flag to default value 'on'... (use SSE2=on or SSE2=off)" -endif -endif - -informSSSE3: -ifneq ($(SSSE3),off) -ifneq ($(SSSE3),on) -ifneq ($(SSSE3),) - @echo "Invalid specified SSE option : "$(SSSE3)"." - @echo - @echo "Possible choices for SSSE3 are 'on' or 'off'" - @exit 1 -endif - @echo "Setting SSSE3 flag to default value 'on'... (use SSSE3=on or SSSE3=off)" -endif -endif - - -# pixman linking -$(CFG_VAR)/$(LIBRARY).lib: $(OBJECTS) - @$(AR) $(PIXMAN_ARFLAGS) -OUT:$@ $^ - -.PHONY: all informMMX informSSE2 informSSSE3 diff --git a/test/Makefile.sources b/test/Makefile.sources deleted file mode 100644 index c9c6c4d..0000000 --- a/test/Makefile.sources +++ /dev/null @@ -1,56 +0,0 @@ -# Tests (sorted by expected completion time) -TESTPROGRAMS = \ - oob-test \ - infinite-loop \ - trap-crasher \ - fence-image-self-test \ - region-translate-test \ - fetch-test \ - a1-trap-test \ - prng-test \ - radial-invalid \ - pdf-op-test \ - region-test \ - combiner-test \ - scaling-crash-test \ - alpha-loop \ - scaling-helpers-test \ - thread-test \ - rotate-test \ - alphamap \ - gradient-crash-test \ - pixel-test \ - matrix-test \ - filter-reduction-test \ - composite-traps-test \ - region-contains-test \ - glyph-test \ - solid-test \ - stress-test \ - cover-test \ - blitters-test \ - affine-test \ - scaling-test \ - composite \ - tolerance-test \ - $(NULL) - -# Other programs -OTHERPROGRAMS = \ - lowlevel-blt-bench \ - radial-perf-test \ - check-formats \ - scaling-bench \ - affine-bench \ - $(NULL) - -# Utility functions -libutils_sources = \ - utils/utils.c \ - utils/utils-prng.c \ - $(NULL) - -libutils_headers = \ - utils/utils.h \ - utils/utils-prng.h \ - $(NULL) diff --git a/test/Makefile.win32 b/test/Makefile.win32 deleted file mode 100644 index d38f0c0..0000000 --- a/test/Makefile.win32 +++ /dev/null @@ -1,61 +0,0 @@ -default: all - -top_srcdir = .. -include $(top_srcdir)/test/Makefile.sources -include $(top_srcdir)/Makefile.win32.common - -TEST_LDADD = \ - $(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib \ - $(CFG_VAR)/libutils.lib \ - $(NULL) - -libutils_OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(libutils_sources)) - -SOURCES = $(patsubst %, %.c, $(TESTPROGRAMS) $(OTHERPROGRAMS)) -OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES)) -TESTS = $(patsubst %, $(CFG_VAR)/%.exe, $(TESTPROGRAMS)) -OTHERS = $(patsubst %, $(CFG_VAR)/%.exe, $(OTHERPROGRAMS)) - -all: inform $(TESTS) $(OTHERS) - -check: inform $(TESTS) - @total=0 ; \ - pass=0 ; \ - skip=0 ; \ - fail=0 ; \ - for test in $(TESTS) ; \ - do \ - total=`expr $$total + 1` ; \ - ./$$test ; \ - r=$$? ; \ - if test $$r -eq 0 ; \ - then echo "PASS: $$test" ; \ - pass=`expr $$pass + 1` ; \ - elif test $$r -eq 77 ; \ - then echo "SKIP: $$test" ; \ - skip=`expr $$skip + 1` ; \ - else echo "FAIL: $$test" ; \ - fail=`expr $$fail + 1` ; \ - fi ; \ - done ; \ - dashes="============================================================================" ; \ - echo "$$dashes" ; \ - echo "Testsuite summary for pixman:" ; \ - echo "$$dashes" ; \ - echo "# TOTAL: $$total" ; \ - echo "# PASS: $$pass" ; \ - echo "# SKIP: $$skip" ; \ - echo "# FAIL: $$fail" ; \ - echo "$$dashes" ; \ - test $$fail -eq 0 - -$(CFG_VAR)/libutils.lib: $(libutils_OBJECTS) - @$(AR) $(PIXMAN_ARFLAGS) -OUT:$@ $^ - -$(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj $(TEST_LDADD) - @$(LD) $(PIXMAN_LDFLAGS) -OUT:$@ $^ - -$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib: - @$(MAKE) -C $(top_builddir)/pixman -f Makefile.win32 - -.PHONY: all check |