diff options
| author | Ada Christine <adachristine18@gmail.com> | 2022-03-23 00:45:57 +0000 |
|---|---|---|
| committer | Ada Christine <adachristine18@gmail.com> | 2022-03-23 00:53:35 +0000 |
| commit | 26f81e50066e5bb7aeae218094e0f834c405a8c1 (patch) | |
| tree | ecf6efe060cb9a88660c80cfddfdbf4709ea7bcd | |
| parent | fd0decea3bfc29523dad2b7a62526d023fe3ccc8 (diff) | |
fix collision with /usr/include/efi/lib.h
squash me
| -rw-r--r-- | efi.mk | 8 | ||||
| -rw-r--r-- | kc/boot/kc_main.c | 2 | ||||
| -rw-r--r-- | kc/core/kstdio.c | 2 | ||||
| -rw-r--r-- | kc/core/memory.h | 2 | ||||
| -rw-r--r-- | kc/core/vm_tree.c | 2 | ||||
| -rw-r--r-- | lib/kstdio.h | 2 | ||||
| -rw-r--r-- | lib/sophialib.h (renamed from lib/lib.h) | 0 | ||||
| -rw-r--r-- | lib/string.c | 2 | ||||
| -rw-r--r-- | loader/Makefile | 2 |
9 files changed, 9 insertions, 13 deletions
@@ -8,19 +8,15 @@ ifeq ($(ARCH),i686) endif ifndef EFIAPIDIR -EFIAPIDIR := /usr/local/include/efi +EFIAPIDIR := /usr/include/efi endif ifndef EFILIBDIR EFILIBDIR := /usr/local/$(TARGET)/lib endif -EFICRT := $(EFILIBDIR)/crt0-efi-$(GNUEFIARCH).o -EFILDSCRIPT := $(EFILIBDIR)/elf_$(GNUEFIARCH)_efi.lds - CPPFLAGS += -I$(EFIAPIDIR) -I$(EFIAPIDIR)/protocol -I$(EFIAPIDIR)/$(GNUEFIARCH) \ - -DGNU_EFI_USE_MS_ABI -DEFI_CALL_WRAPPER -DEFI_DEBUG - + -DEFI_CALL_WRAPPER -DGNU_EFI_USE_MS_ABI %.efi: $(CC.info) @$(CC) $(LDFLAGS) -o $@ $^ diff --git a/kc/boot/kc_main.c b/kc/boot/kc_main.c index cb8eb7a..fe670b0 100644 --- a/kc/boot/kc_main.c +++ b/kc/boot/kc_main.c @@ -3,7 +3,7 @@ #include <loader/efi/shim.h> #include <kernel/entry.h> #include <kernel/memory/range.h> -#include <lib.h> +#include <sophialib.h> #include <stdbool.h> diff --git a/kc/core/kstdio.c b/kc/core/kstdio.c index 2971b18..fdb52b7 100644 --- a/kc/core/kstdio.c +++ b/kc/core/kstdio.c @@ -1,7 +1,7 @@ #include "kprint.h" #include "serial.h" -#include <lib.h> +#include <sophialib.h> #include <stdint.h> #include <stdbool.h> diff --git a/kc/core/memory.h b/kc/core/memory.h index 6b7a816..a587d56 100644 --- a/kc/core/memory.h +++ b/kc/core/memory.h @@ -4,7 +4,7 @@ #include <kernel/memory/paging.h> #include <kernel/memory/range.h> -#include <lib.h> +#include <sophialib.h> #include <core/memory.h> diff --git a/kc/core/vm_tree.c b/kc/core/vm_tree.c index cca32bb..88a4be1 100644 --- a/kc/core/vm_tree.c +++ b/kc/core/vm_tree.c @@ -32,7 +32,7 @@ #include "panic.h" #include "kprint.h" -#include <lib.h> +#include <sophialib.h> #define assert(expr) diff --git a/lib/kstdio.h b/lib/kstdio.h index 79ed357..d3615f1 100644 --- a/lib/kstdio.h +++ b/lib/kstdio.h @@ -1,6 +1,6 @@ #pragma once -#include <lib.h> +#include <sophialib.h> #include <stdarg.h> diff --git a/lib/lib.h b/lib/sophialib.h index c28e17c..c28e17c 100644 --- a/lib/lib.h +++ b/lib/sophialib.h diff --git a/lib/string.c b/lib/string.c index c4764ce..3d3f4a1 100644 --- a/lib/string.c +++ b/lib/string.c @@ -1,4 +1,4 @@ -#include <lib.h> +#include <sophialib.h> size_t strlen(const char *s) { diff --git a/loader/Makefile b/loader/Makefile index add25e7..9ac52f7 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -5,7 +5,7 @@ VPATH := ../lib IMAGE := loader.efi -CPPFLAGS += -I../api -I../lib +CPPFLAGS += -I../api -I../lib -I$(EFIAPIDIR) CFLAGS += --target=$(GNUEFIARCH)-unknown-windows -fshort-wchar -mno-avx \ -mno-sse -mno-mmx -funsigned-char -Wno-pointer-sign -ggdb \ |