From df2c51f5b9a09d8f7feb54fabf9cde9f375bb752 Mon Sep 17 00:00:00 2001 From: nishi Date: Sat, 8 Jul 2023 09:53:56 +0000 Subject: Made a branch/0.x.x and tags/0.0.1, following the Subversion habit. git-svn-id: https://svn.vegaa.systems/svn/vega-Vega/trunk@11 a8a8aea2-181d-ee11-89e8-15fd0e089fc4 --- Makefile.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 7d3d8eb..c5ce256 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,13 +5,18 @@ ############################### # CFLAGS, QEMU flags + misc ############################### +override ARCH = @ARCH@ override VEGA_VERSION = @PACKAGE_VERSION@ override PROMPT := printf "%s\t\t%s\n" -override KERNEL_DEFINES = -DVEGA_VERSION="\"$(VEGA_VERSION)\"" +override KERNEL_DEFINES = -DVEGA_VERSION="\"$(VEGA_VERSION)\""\ + -DVEGA_BUILDDATE="\"@VEGA_BUILDDATE@\""\ + -DVEGA_BUILDUSER="\"@VEGA_BUILDUSER@\""\ + -DVEGA_BUILDHOST="\"@VEGA_BUILDHOST@\""\ + -DVEGA_BUILDDIR="\"@VEGA_BUILDDIR@\""\ + -DVEGA_ARCH="\"@ARCH@\"" override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES) override KERNEL_LDFLAGS = -nostdlib -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld override QEMU_FLAGS = @QEMU_FLAGS@ -override ARCH = @ARCH@ ###################### # Binutils stuff @@ -79,8 +84,8 @@ base/boot/vega-kernel: $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) mv initramfs.tar iso_root/boot/ xorriso -as mkisofs -b limine-cd.bin -no-emul-boot -boot-load-size 4\ -boot-info-table --efi-boot limine-cd-efi.bin -efi-boot-part \ - --efi-boot-image --protective-msdos-label iso_root -o Vega.iso &> /dev/null - stand/limine/limine-deploy Vega.iso &> /dev/null + --efi-boot-image --protective-msdos-label iso_root -o Vega.iso > /dev/null + stand/limine/limine-deploy Vega.iso > /dev/null $(PROMPT) " ISO " $(shell pwd)/Vega.iso -include $(KERNEL_HEADER_DEPS) -- cgit v1.2.3