diff --git a/tests/Makefile.in b/tests/Makefile.in index 26ae782b00..396d64ab28 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -338,7 +338,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ ### Targets: ### -all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data fr +all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data data-images fr install: @@ -406,6 +406,18 @@ data: esac; \ done +data-images: + @mkdir -p image + @for f in horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp; do \ + if test ! -f image/$$f -a ! -d image/$$f ; \ + then x=yep ; \ + else x=`find $(srcdir)/image/$$f -newer image/$$f -print` ; \ + fi; \ + case "$$x" in ?*) \ + cp -pRf $(srcdir)/image/$$f image ;; \ + esac; \ + done + fr: @mkdir -p ./intl/fr @for f in internat.po internat.mo; do \ @@ -925,4 +937,4 @@ failtest: # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean test_gui_bundle data fr +.PHONY: all install uninstall clean distclean test_gui_bundle data data-images fr diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 812e939fae..d1c4d4f5b0 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -421,7 +421,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe $(__test_gui___depname) data fr +all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -456,6 +456,10 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +data-images: + if not exist image mkdir image + for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%f copy .\image\%f image + fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 49ea23cddd..cdcc61af59 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -417,7 +417,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe $(__test_gui___depname) data fr +all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o @@ -437,6 +437,10 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) +data-images: + if not exist image mkdir image + for %%f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%%f copy .\image\%%f image + fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr @@ -933,7 +937,7 @@ $(OBJS)\test_gui_setsize.o: ./window/setsize.cpp $(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< -.PHONY: all clean data fr +.PHONY: all clean data data-images fr SHELL := $(COMSPEC) diff --git a/tests/makefile.vc b/tests/makefile.vc index 91f4734924..86c782f582 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -553,7 +553,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe $(__test_gui___depname) data fr +all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -582,6 +582,10 @@ data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +data-images: + if not exist image mkdir image + for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%f copy .\image\%f image + fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr diff --git a/tests/makefile.wat b/tests/makefile.wat index e566570d79..51549e53ed 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -455,7 +455,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data fr +all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data data-images fr clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -496,6 +496,10 @@ data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) +data-images : .SYMBOLIC + if not exist image mkdir image + for %f in (horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp) do if not exist image\%f copy .\image\%f image + fr : .SYMBOLIC if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr diff --git a/tests/test.bkl b/tests/test.bkl index 344abee419..ba5bf00ae7 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -230,6 +230,14 @@ horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm + + $(SRCDIR)/image + image + horse_grey.bmp horse_grey_flipped.bmp + horse_rle4.bmp horse_rle4_flipped.bmp + horse_rle8.bmp horse_rle8_flipped.bmp + +