summaryrefslogtreecommitdiffstats
path: root/efi_memtest/Makefile
diff options
context:
space:
mode:
authorRegina König2020-07-27 14:19:31 +0200
committerRegina König2020-07-27 14:19:31 +0200
commitb6ac51d02d6dd46bf99d805fe8370640df11ef94 (patch)
tree648fac5fd8dc00a446b1a64fea173069b7d744c1 /efi_memtest/Makefile
parentMakefile seems to be correct (diff)
downloadmemtest86-b6ac51d02d6dd46bf99d805fe8370640df11ef94.tar.gz
memtest86-b6ac51d02d6dd46bf99d805fe8370640df11ef94.tar.xz
memtest86-b6ac51d02d6dd46bf99d805fe8370640df11ef94.zip
created two different directories to separate files for efi and bios. moved stdin.h, stdint.h and a new header rsdp.h into these dirs
Diffstat (limited to 'efi_memtest/Makefile')
-rw-r--r--efi_memtest/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/efi_memtest/Makefile b/efi_memtest/Makefile
index e8489aa..c673435 100644
--- a/efi_memtest/Makefile
+++ b/efi_memtest/Makefile
@@ -26,7 +26,7 @@ PREPROCESSOR=-DUEFI -DUSING_LTO -Os \
INCLUDE_FILES=main cpuid test smp config screen_buffer lib init controller pci \
spd dmi reloc patn linuxbios error vmem memsize random
-ADDITIONAL_HEADER=$(addprefix memtest86+/, defs.h linuxbios_tables.h stdin.h io.h \
+ADDITIONAL_HEADER=$(addprefix memtest86+/, defs.h linuxbios_tables.h efi/stdin.h io.h \
stdint.h stddef.h serial.h msr.h jedec_id.h elf.h)
OBJS=AutoGen.obj main.o test.o smp.o config.o screen_buffer.o lib.o init.o controller.o \
@@ -63,7 +63,7 @@ $(MAIN_FILE).dll: $(MAIN_FILE).lib
-DSTRING_ARRAY_NAME=${MAIN_FILE}Strings \
-I OUTPUT/ \
-I Library/
- objcopy --strip-unneeded -R .eh_frame -v OUTPUT/$MAIN_FILE.dll OUTPUT/$MAIN_FILE.dll
+ objcopy --strip-unneeded -R .eh_frame -v OUTPUT/$(MAIN_FILE).dll OUTPUT/$(MAIN_FILE).dll
$(MAIN_FILE).lib: $(OBJS)
gcc-ar crv OUTPUT/$(MAIN_FILE).lib $(OBJS)
@@ -87,7 +87,8 @@ AutoGen.obj: memtest86+/efi/Include/AutoGen.c
memtest86+/efi/Include/AutoGen.c
%.o: memtest86+/%.c
- $(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $<
+ $(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \
+ -I"memtest86+/efi"
clean:
rm -f OUTPUT/*