github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

w.i.p. move the livecd icon image out of the AROS dir and under Disks, and rename for consistency. invoke the icon target from the distfiles targets to make the correct icon for the built platform.

This commit is contained in:
Kalamatee 2019-06-26 19:23:12 +01:00 committed by deadwood
parent 443898384e
commit b5bcac282e
13 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/i386-pc/boot/iso/mmakefile.src
View File

@ -9,7 +9,8 @@ TARGET_ISO := $(DISTDIR)/aros$(AROS_TARGET_SUFFIX)-pc-i386.iso
#MM bootiso-pc-i386 : AROS-complete \
#MM kernel-package-pc-i386 \
#MM AROS-pc-drivers \
#MM bootloader-$(AROS_TARGET_BOOTLOADER)-pc-i386
#MM bootloader-$(AROS_TARGET_BOOTLOADER)-pc-i386 \
#MM iconset-$(AROS_TARGET_ICONSET)-icons-aros-livecd
bootiso-pc-i386: $(AROSDIR)/.backdrop $(TARGET_ISO)

6
arch/m68k-amiga/boot/iso/mmakefile.src
View File

@ -13,7 +13,8 @@ DEVEL_ISO := $(DISTDIR)/aros$(AROS_TARGET_SUFFIX)-amiga-m68k-devel.iso
#MM kernel-package-amiga-m68k \
#MM kernel-bootstrap-amiga-m68k \
#MM AROS-amiga-m68k-drivers \
#MM bootdisk-amiga-m68k-gen
#MM bootdisk-amiga-m68k-gen \
#MM iconset-$(AROS_TARGET_ICONSET)-icons-aros-livecd
#MM deviso-amiga-m68k : AROS-complete \
#MM kernel-aros \
@ -21,7 +22,8 @@ DEVEL_ISO := $(DISTDIR)/aros$(AROS_TARGET_SUFFIX)-amiga-m68k-devel.iso
#MM kernel-package-amiga-m68k \
#MM kernel-bootstrap-amiga-m68k \
#MM AROS-amiga-m68k-drivers \
#MM bootdisk-amiga-m68k-gen
#MM bootdisk-amiga-m68k-gen \
#MM iconset-$(AROS_TARGET_ICONSET)-icons-aros-livecd
TAR ?= tar
Q ?= @

2
boot/mmakefile.src
View File

@ -13,6 +13,8 @@ include $(SRCDIR)/config/aros.cfg
#MM boot : boot-$(ARCH)-$(CPU)-$(AROS_TARGET_VARIANT) boot-$(ARCH)-$(CPU) boot-$(ARCH) boot-$(FAMILY)
#MM distfiles-system : iconset-$(AROS_TARGET_ICONSET)-icons-aros-$(AROS_TARGET_ARCH)-system
#MM
distfiles-system:
%mkdir_q dir="$(DISTDIR)"

1
images/IconSets/Gorilla/Icons/Medium/AROS/mmakefile.src
View File

@ -14,7 +14,6 @@ ADDITIONALICONS := Demos \
#MM- iconset-Gorilla-wbench-icons-clean : iconset-Gorilla-wbench-icons-aros-clean iconset-Gorilla-additional-icons-aros-clean
#MM- iconset-Gorilla-wbench-icons : iconset-Gorilla-wbench-icons-aros
#MM- iconset-Gorilla-wbench-icons : iconset-Gorilla-additional-icons-aros
#MM iconset-Gorilla-wbench-icons-aros : iconset-Gorilla-wbench-icons-aros-livecd
%build_icons mmake=iconset-Gorilla-wbench-icons-aros icons=$(BASEICONS) dir=$(AROSDIR)

1
images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_Linux.info.src Normal file
View File

@ -0,0 +1 @@
TYPE = DISK

BIN
images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_Linux.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

1
images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_MacOS.info.src Normal file
View File

@ -0,0 +1 @@
TYPE = DISK

BIN
images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_MacOS.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

1
images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_Windows.info.src Normal file
View File

@ -0,0 +1 @@
TYPE = DISK

BIN
images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_Windows.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

0
images/IconSets/Gorilla/Icons/Medium/AROS/LiveCD.info.src → images/IconSets/Gorilla/Icons/Medium/Disks/CDROM_AROS.info.src
View File

0
images/IconSets/Gorilla/Icons/Medium/AROS/LiveCD.png → images/IconSets/Gorilla/Icons/Medium/Disks/CDROM_AROS.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

18
images/IconSets/Gorilla/Icons/Medium/Disks/mmakefile.src
View File

@ -9,3 +9,21 @@ ICONS := CDROM_Amiga Harddisk_Amiga Harddisk_Linux Harddisk_MacOS Harddisk_Windo
#MM- themes-gorilla-icons : themes-gorilla-icons-disks
%build_icons mmake=themes-gorilla-icons-disks icons=$(ICONS) \
dir=$(AROS_CONTRIB)/Icons/Gorilla/Disks
#MM
iconset-Gorilla-icons-aros-livecd :
@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/CDROM_AROS.info.src $(SRCDIR)/$(CURDIR)/CDROM_AROS.png $(AROSDIR)/disk.info
#MM
iconset-Gorilla-icons-aros-linux-system :
@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/AROSHarddisk_Linux.info.src $(SRCDIR)/$(CURDIR)/AROSHarddisk_Linux.png $(AROSDIR)/disk.info
#MM
iconset-Gorilla-icons-aros-windows-system :
@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/AROSHarddisk_Windows.info.src $(SRCDIR)/$(CURDIR)/AROSHarddisk_Windows.png $(AROSDIR)/disk.info
#MM
iconset-Gorilla-icons-aros-darwin-system :
@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/AROSHarddisk_MacOS.info.src $(SRCDIR)/$(CURDIR)/AROSHarddisk_MacOS.png $(AROSDIR)/disk.info