diff options
| -rw-r--r-- | packimages/pack/makefile.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index c58900d154b5..d1838b1f41d6 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -41,12 +41,13 @@ RSCCUSTOMIMG*=$(PRJ) IMAGES := $(COMMONBIN)$/images.zip SORTED_LIST=$(RES)$/img$/sorted.lst # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially -CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic +CUSTOM_IMAGE_SETS=hicontrast industrial crystal oxygen tango classic CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz +OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip @@ -89,6 +90,14 @@ $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL) .ENDIF @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed" +# unpack the Oxygen icon set +$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL) + cd $(MISC) && gzip -d -c $(OXYGEN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) +.IF "$(GUI)"=="UNX" + chmod -R g+w $(MISC)$/oxygen +.ENDIF + @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed" + # unpack the classic icon set $(MISC)$/classic.flag : $(CLASSIC_TARBALL) cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) @@ -102,5 +111,7 @@ images_hicontrast : $(MISC)$/hicontrast.flag $(RES)$/img$/commandimagelist.ilst images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst +images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst + images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst |