:: commit 366d75e740c6a3b52be5b781e24685abd3fc21ac

mintsuki <mintsuki@protonmail.com> — 2020-12-30 22:42

parents: 7f1dd08892

misc: Remove limine.h and retrieve LIMINE_VERSION value from current git branch instead

diff --git a/limine-pxe.bin b/limine-pxe.bin
index 7ed24641..e8f7ca08 100644
Binary files a/limine-pxe.bin and b/limine-pxe.bin differ
diff --git a/limine.bin b/limine.bin
index a4979175..f11c5e97 100644
Binary files a/limine.bin and b/limine.bin differ
diff --git a/stage2/Makefile b/stage2/Makefile
index 9e4ccdcf..f0c325b2 100644
--- a/stage2/Makefile
+++ b/stage2/Makefile
@@ -3,6 +3,7 @@ LD = i386-elf-gcc
 OBJCOPY = i386-elf-objcopy
 OBJDUMP = i386-elf-objdump
 
+LIMINE_VERSION := $(shell git branch --show-current | sed 's/-branch//')
 WERROR = -Werror
 CFLAGS = -Os -pipe -Wall -Wextra $(WERROR)
 
@@ -21,6 +22,7 @@ INTERNAL_CFLAGS = \
 	-mno-sse \
 	-mno-sse2 \
 	-MMD \
+	-DLIMINE_VERSION='"$(LIMINE_VERSION)"' \
 	-I. \
 	-I..
 
diff --git a/stage2/limine.h b/stage2/limine.h
deleted file mode 100644
index d602bb0a..00000000
--- a/stage2/limine.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LIMINE_H__
-#define __LIMINE_H__
-
-#define LIMINE_VERSION "0.7"
-
-#endif
diff --git a/stage2/main.c b/stage2/main.c
index 45a32f11..f91824ca 100644
--- a/stage2/main.c
+++ b/stage2/main.c
@@ -1,4 +1,3 @@
-#include <limine.h>
 #include <lib/term.h>
 #include <lib/real.h>
 #include <lib/blib.h>
diff --git a/stage2/menu.c b/stage2/menu.c
index 68994662..51c12455 100644
--- a/stage2/menu.c
+++ b/stage2/menu.c
@@ -1,7 +1,6 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include <limine.h>
 #include <menu.h>
 #include <lib/print.h>
 #include <lib/blib.h>
diff --git a/stage2/protos/stivale2.c b/stage2/protos/stivale2.c
index 13a5728f..624ebcae 100644
--- a/stage2/protos/stivale2.c
+++ b/stage2/protos/stivale2.c
@@ -1,7 +1,6 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include <limine.h>
 #include <protos/stivale.h>
 #include <protos/stivale2.h>
 #include <lib/elf.h>
tab: 248 wrap: offon