X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=blobdiff_plain;f=synfig-studio%2Fimages%2FMakefile.am;h=01e3c269ff722805fa7214ffc2a798c24f9be3de;hp=4fb3b952bf9509aeee3a134b6cc393f63a46da34;hb=0359346f781b070b6e24d3a65c57a504e4a6ddf8;hpb=28bfe70db2b18fb7df871526f89129fd99d97308

diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index 4fb3b95..01e3c26 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -6,8 +6,10 @@ EXT = @imageext@
 EXTRA_DIST = \
 	installer_logo.sif \
 	installer_logo_osx.sif \
-	splash_screen.sifz \
-	splash_screen-0.61.09.sif\
+	splash_screen-0.62.01.sif \
+	splash_screen-0.62.01-2.sif \
+	splash_screen-0.62.00.sif \
+	splash_screen-0.61.09.sif \
 	splash_screen-0.61.08.sif \
 	splash_screen-0.61.07.sif \
 	about_icon.sif \
@@ -89,16 +91,9 @@ EXTRA_DIST = \
 	decr_resolution_icon.sif \
 	render_options_icon.sif \
 	preview_options_icon.sif \
-	layer_checkerboard_icon.sif \
-	layer_duplicate_icon.sif \
-	layer_gradient_spiral_icon.sif \
-	layer_gradient_radial_icon.sif \
-	layer_gradient_noise_icon.sif \
-	layer_gradient_curve_icon.sif \
-	layer_gradient_conical_icon.sif \
-	layer_blur_icon.sif \
-	layer_blur_radial_icon.sif \
+	layer_blur_blur_icon.sif \
 	layer_blur_motion_icon.sif \
+	layer_blur_radial_icon.sif \
 	layer_distortion_curvewarp_icon.sif \
 	layer_distortion_insideout_icon.sif \
 	layer_distortion_noise_icon.sif \
@@ -106,14 +101,46 @@ EXTRA_DIST = \
 	layer_distortion_stretch_icon.sif \
 	layer_distortion_twirl_icon.sif \
 	layer_distortion_warp_icon.sif \
+	layer_example_filledrectangle_icon.sif \
+	layer_example_metaballs_icon.sif \
+	layer_example_simplecircle_icon.sif \
 	layer_filter_clamp_icon.sif \
 	layer_filter_colorcorrect_icon.sif \
 	layer_filter_halftone2_icon.sif \
 	layer_filter_halftone3_icon.sif \
-	layer_filter_luma_icon.sif \
+	layer_filter_lumakey_icon.sif \
+	layer_fractal_julia_icon.sif \
+	layer_fractal_mandelbrot_icon.sif \
+	layer_geometry_checkerboard_icon.sif \
+	layer_geometry_circle_icon.sif \
+	layer_geometry_outline_icon.sif \
+	layer_geometry_polygon_icon.sif \
+	layer_geometry_rectangle_icon.sif \
+	layer_geometry_region_icon.sif \
+	layer_geometry_solidcolor_icon.sif \
+	layer_geometry_star_icon.sif \
+	layer_gradient_conical_icon.sif \
+	layer_gradient_curve_icon.sif \
+	layer_gradient_lineal_icon.sif \
+	layer_gradient_noise_icon.sif \
+	layer_gradient_radial_icon.sif \
+	layer_gradient_spiral_icon.sif \
+	layer_other_duplicate_icon.sif \
+	layer_other_importimage_icon.sif \
+	layer_other_pastecanvas_icon.sif \
+	layer_other_plant_icon.sif \
+	layer_other_supersample_icon.sif \
+	layer_other_text_icon.sif \
+	layer_other_timeloop_icon.sif \
+	layer_other_xorpattern_icon.sif \
+	layer_stylize_bevel_icon.sif \
+	layer_stylize_shade_icon.sif \
+	layer_transform_rotate_icon.sif \
+	layer_transform_translate_icon.sif \
+	layer_transform_zoom_icon.sif \
 	action_set_layer_description_icon.sif \
 	action_add_to_group_icon.sif \
-	action_remove_from_group_icon.sif
+	action_remove_from_group_icon.sif \
 	action_export_icon.sif \
 	action_unexport_icon.sif
 
@@ -200,16 +227,9 @@ IMAGES = \
 	decr_resolution_icon.$(EXT) \
 	render_options_icon.$(EXT) \
 	preview_options_icon.$(EXT) \
-	layer_checkerboard_icon.$(EXT) \
-	layer_duplicate_icon.$(EXT) \
-	layer_gradient_spiral_icon.$(EXT) \
-	layer_gradient_radial_icon.$(EXT) \
-	layer_gradient_noise_icon.$(EXT) \
-	layer_gradient_curve_icon.$(EXT) \
-	layer_gradient_conical_icon.$(EXT) \
-	layer_blur_icon.$(EXT) \
-	layer_blur_radial_icon.$(EXT) \
+	layer_blur_blur_icon.$(EXT) \
 	layer_blur_motion_icon.$(EXT) \
+	layer_blur_radial_icon.$(EXT) \
 	layer_distortion_curvewarp_icon.$(EXT) \
 	layer_distortion_insideout_icon.$(EXT) \
 	layer_distortion_noise_icon.$(EXT) \
@@ -217,11 +237,43 @@ IMAGES = \
 	layer_distortion_stretch_icon.$(EXT) \
 	layer_distortion_twirl_icon.$(EXT) \
 	layer_distortion_warp_icon.$(EXT) \
+	layer_example_filledrectangle_icon.$(EXT) \
+	layer_example_metaballs_icon.$(EXT) \
+	layer_example_simplecircle_icon.$(EXT) \
 	layer_filter_clamp_icon.$(EXT) \
 	layer_filter_colorcorrect_icon.$(EXT) \
 	layer_filter_halftone2_icon.$(EXT) \
 	layer_filter_halftone3_icon.$(EXT) \
-	layer_filter_luma_icon.$(EXT) \
+	layer_filter_lumakey_icon.$(EXT) \
+	layer_fractal_julia_icon.$(EXT) \
+	layer_fractal_mandelbrot_icon.$(EXT) \
+	layer_geometry_checkerboard_icon.$(EXT) \
+	layer_geometry_circle_icon.$(EXT) \
+	layer_geometry_outline_icon.$(EXT) \
+	layer_geometry_polygon_icon.$(EXT) \
+	layer_geometry_rectangle_icon.$(EXT) \
+	layer_geometry_region_icon.$(EXT) \
+	layer_geometry_solidcolor_icon.$(EXT) \
+	layer_geometry_star_icon.$(EXT) \
+	layer_gradient_conical_icon.$(EXT) \
+	layer_gradient_curve_icon.$(EXT) \
+	layer_gradient_lineal_icon.$(EXT) \
+	layer_gradient_noise_icon.$(EXT) \
+	layer_gradient_radial_icon.$(EXT) \
+	layer_gradient_spiral_icon.$(EXT) \
+	layer_other_duplicate_icon.$(EXT) \
+	layer_other_importimage_icon.$(EXT) \
+	layer_other_pastecanvas_icon.$(EXT) \
+	layer_other_plant_icon.$(EXT) \
+	layer_other_supersample_icon.$(EXT) \
+	layer_other_text_icon.$(EXT) \
+	layer_other_timeloop_icon.$(EXT) \
+	layer_other_xorpattern_icon.$(EXT) \
+	layer_stylize_bevel_icon.$(EXT) \
+	layer_stylize_shade_icon.$(EXT) \
+	layer_transform_rotate_icon.$(EXT) \
+	layer_transform_translate_icon.$(EXT) \
+	layer_transform_zoom_icon.$(EXT) \
 	action_set_layer_description_icon.$(EXT) \
 	action_add_to_group_icon.$(EXT) \
 	action_remove_from_group_icon.$(EXT) \
@@ -307,6 +359,19 @@ keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif
 	echo "  File \"images\\$@\"" >>./images.nsh
 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
 
+if DEVELOPMENT_SNAPSHOT
+splash_screen_development.sif: $(srcdir)/splash_screen_development.sif.in
+	export commit_id=`git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -6` && \
+	export commit_date=`git show --pretty=format:%ci HEAD |  head -c 10` && \
+	export branch=`git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//` && \
+	export branch=`echo $$branch | egrep origin/master > /dev/null && echo master || echo $$branch | cut -d ' ' -f 1 | sed -e 's/.*\///'` && \
+	sed "s|%branch%|$$branch|" $< | sed "s|%commit_date%|$$commit_date|" | sed "s|%commit_id%|$$commit_id|" > $@
+splash_screen.$(EXT): $(srcdir)/splash_screen_development.sif
+	$(SYNFIG) -q $< -o $@ --time 0
+else
+splash_screen.$(EXT): $(srcdir)/splash_screen-$(PACKAGE_VERSION).sif
+	$(SYNFIG) -q $< -o $@ --time 0
+endif
 
 if !WIN32_PKG
 if !MACOSX_PKG