summaryrefslogtreecommitdiffstats
path: root/efi_memtest/Makefile
diff options
context:
space:
mode:
authorRegia König2021-04-08 16:10:13 +0200
committerRegia König2021-04-08 16:10:13 +0200
commit8f20336b09da381bfceb487db4d86e1867c14e82 (patch)
tree7dad2992337aaae27126e32b2d88458f12370cac /efi_memtest/Makefile
parentAdd one object in Makefile (diff)
downloadmemtest86-8f20336b09da381bfceb487db4d86e1867c14e82.tar.gz
memtest86-8f20336b09da381bfceb487db4d86e1867c14e82.tar.xz
memtest86-8f20336b09da381bfceb487db4d86e1867c14e82.zip
Change order of libs
Diffstat (limited to 'efi_memtest/Makefile')
-rw-r--r--efi_memtest/Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/efi_memtest/Makefile b/efi_memtest/Makefile
index ad23af2..0ecc3de 100644
--- a/efi_memtest/Makefile
+++ b/efi_memtest/Makefile
@@ -26,17 +26,19 @@ PREPROCESSOR=-DUEFI -DUSING_LTO -Os \
INCLUDE_FILES=main cpuid test smp config screen_buffer lib init controller pci \
spd dmi reloc patn error vmem memsize random logger memory_tables
-ADDITIONAL_HEADER=$(addprefix memtest86+/, defs.h efi/stdin.h io.h \
- stdint.h stddef.h serial.h msr.h jedec_id.h elf.h efi/main_asm.h)
+#ADDITIONAL_HEADER=$(addprefix memtest86+/, defs.h efi/stdin.h io.h \
+# stdint.h stddef.h serial.h msr.h jedec_id.h elf.h efi/main_asm.h)
OBJS=AutoGen.obj main.o display.o test.o smp.o config.o screen_buffer.o lib.o init.o controller.o \
pci.o spd.o dmi.o reloc.o patn.o error.o vmem.o cpuid.o memsize.o \
- random.o MemtestEfi.obj logger.o memory_tables.o BaseDebugPrintErrorLevelLib.o
+ random.o MemtestEfi.obj logger.o memory_tables.o
+ #BaseDebugPrintErrorLevelLib.o
LIBS_PATH=memtest86+/efi/Include/libs
-LIBRARIES=OUTPUT/MemtestEfi.lib $(addprefix $(LIBS_PATH)/, BaseLib.lib BaseMemoryLib.lib BasePcdLibNull.lib BasePrintLib.lib UefiApplicationEntryPoint.lib \
- UefiBootServicesTableLib.lib UefiDebugLibStdErr.lib UefiDevicePathLib.lib UefiLib.lib \
+LIBRARIES=OUTPUT/MemtestEfi.lib $(addprefix $(LIBS_PATH)/,UefiApplicationEntryPoint.lib UefiLib.lib BaseLib.lib \
+ BaseMemoryLib.lib BasePcdLibNull.lib BasePrintLib.lib \
+ UefiBootServicesTableLib.lib UefiDebugLibStdErr.lib UefiDevicePathLib.lib \
UefiMemoryAllocationLib.lib UefiRuntimeServicesTableLib.lib)
SRC_PATH=memtest86+/efi/Include/src
@@ -104,8 +106,10 @@ AutoGen.obj: memtest86+/efi/Include/AutoGen.c
-I"memtest86+/efi"
%.o: memtest86+/efi/Include/src/%.c
+ echo "CREATE EDK OBJECTS"
$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \
- -I"memtest86/efi/Include"
+ -I"memtest86+/efi/Include" \
+ -I"memtest86+/efi/Include/Library"
%.o: memtest86+/efi/%.c
$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \