:: commit ee9928d1c2470ffec6f99d851172b3bc1c7144bd

mintsuki <mintsuki@users.noreply.github.com> — 2021-11-30 00:12

parents: 6995d449e9

Binary release v2.68

diff --git a/BOOTIA32.EFI b/BOOTIA32.EFI
index 6cf20174..5d2eff94 100755
Binary files a/BOOTIA32.EFI and b/BOOTIA32.EFI differ
diff --git a/BOOTX64.EFI b/BOOTX64.EFI
index 014a954c..17738fbd 100755
Binary files a/BOOTX64.EFI and b/BOOTX64.EFI differ
diff --git a/Makefile b/Makefile
index 3237a53b..0f789d75 100644
--- a/Makefile
+++ b/Makefile
@@ -3,29 +3,26 @@ CC = cc
 PREFIX = /usr/local
 DESTDIR =
 
-BUILDDIR = .
-LIMINE_HDD_BIN = limine-hdd.bin
-
 CFLAGS = -O2 -pipe -Wall -Wextra
 
 .PHONY: all install clean
 
-all: $(BUILDDIR)/limine-install
+all: limine-install
 
 install: all
-	install -d "$(DESTDIR)$(PREFIX)/bin"
-	install -s "$(BUILDDIR)/limine-install" "$(DESTDIR)$(PREFIX)/bin/"
-	install -d "$(DESTDIR)$(PREFIX)/share"
-	install -d "$(DESTDIR)$(PREFIX)/share/limine"
-	install -m 644 limine.sys "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 limine-cd.bin "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 limine-eltorito-efi.bin "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 limine-pxe.bin "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 BOOTX64.EFI "$(DESTDIR)$(PREFIX)/share/limine/"
-	install -m 644 BOOTIA32.EFI "$(DESTDIR)$(PREFIX)/share/limine/"
+	install -d '$(DESTDIR)$(PREFIX)/bin'
+	install -s limine-install '$(DESTDIR)$(PREFIX)/bin/'
+	install -d '$(DESTDIR)$(PREFIX)/share'
+	install -d '$(DESTDIR)$(PREFIX)/share/limine'
+	install -m 644 limine.sys '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 limine-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 limine-eltorito-efi.bin '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 limine-pxe.bin '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 BOOTX64.EFI '$(DESTDIR)$(PREFIX)/share/limine/'
+	install -m 644 BOOTIA32.EFI '$(DESTDIR)$(PREFIX)/share/limine/'
 
 clean:
-	rm -f "$(BUILDDIR)/limine-install" "$(BUILDDIR)/limine-install.exe"
+	rm -f limine-install limine-install.exe
 
-$(BUILDDIR)/limine-install: limine-install.c inc.S $(LIMINE_HDD_BIN)
-	$(CC) $(CFLAGS) -std=c11 -DLIMINE_HDD_BIN='"$(LIMINE_HDD_BIN)"' limine-install.c inc.S -o "$@"
+limine-install: limine-install.c inc.S limine-hdd.bin
+	$(CC) $(CFLAGS) -std=c11 limine-install.c inc.S -o $@
diff --git a/inc.S b/inc.S
index 9edb2989..c28f3ca9 100644
--- a/inc.S
+++ b/inc.S
@@ -4,7 +4,7 @@
 .data
 .global __binary_limine_hdd_bin_start
 __binary_limine_hdd_bin_start:
-    .incbin LIMINE_HDD_BIN
+    .incbin "limine-hdd.bin"
 .global __binary_limine_hdd_bin_end
 __binary_limine_hdd_bin_end:
 
@@ -13,7 +13,7 @@ __binary_limine_hdd_bin_end:
 .section .data
 .global __binary_limine_hdd_bin_start
 __binary_limine_hdd_bin_start:
-    .incbin LIMINE_HDD_BIN
+    .incbin "limine-hdd.bin"
 .global __binary_limine_hdd_bin_end
 __binary_limine_hdd_bin_end:
 
@@ -26,7 +26,7 @@ __binary_limine_hdd_bin_end:
 .section .data
 .global _binary_limine_hdd_bin_start
 _binary_limine_hdd_bin_start:
-    .incbin LIMINE_HDD_BIN
+    .incbin "limine-hdd.bin"
 .global _binary_limine_hdd_bin_end
 _binary_limine_hdd_bin_end:
 
diff --git a/limine-cd.bin b/limine-cd.bin
index f6be7afd..71cfe172 100644
Binary files a/limine-cd.bin and b/limine-cd.bin differ
diff --git a/limine-eltorito-efi.bin b/limine-eltorito-efi.bin
index 799f9ec0..bf8bb71e 100644
Binary files a/limine-eltorito-efi.bin and b/limine-eltorito-efi.bin differ
diff --git a/limine-hdd.bin b/limine-hdd.bin
index 05b9c278..4a018701 100644
Binary files a/limine-hdd.bin and b/limine-hdd.bin differ
diff --git a/limine-install-linux-x86_32 b/limine-install-linux-x86_32
index c0b42d04..51df278a 100755
Binary files a/limine-install-linux-x86_32 and b/limine-install-linux-x86_32 differ
diff --git a/limine-install-linux-x86_64 b/limine-install-linux-x86_64
index 5aa5b069..2861c499 100755
Binary files a/limine-install-linux-x86_64 and b/limine-install-linux-x86_64 differ
diff --git a/limine-install-win32.exe b/limine-install-win32.exe
index d38387a5..b0ddd7a8 100755
Binary files a/limine-install-win32.exe and b/limine-install-win32.exe differ
diff --git a/limine-pxe.bin b/limine-pxe.bin
index 2ad9ecbe..74a38d75 100644
Binary files a/limine-pxe.bin and b/limine-pxe.bin differ
diff --git a/limine.sys b/limine.sys
index 1515a790..8f4c5c7e 100755
Binary files a/limine.sys and b/limine.sys differ
tab: 248 wrap: offon