2 files changed, 19 insertions, 5 deletions
diff --git a/efi_memtest/Makefile b/efi_memtest/Makefile
index 487cba3..681f252 100644
--- a/efi_memtest/Makefile
+++ b/efi_memtest/Makefile
@@ -39,6 +39,13 @@ UefiDevicePathLib_OBJS=DevicePathFromText.o DevicePathToText.o DevicePathUtiliti
 	DevicePathUtilitiesDxeSmm.o DevicePathUtilitiesStandaloneMm.o UefiDevicePathLib.o \
 	UefiDevicePathLibOptionalDevicePathProtocol.o
 
+BaseLib_OBJS=CheckSum.o SwitchStack.o SwapBytes64.o SwapBytes32.o SwapBytes16.o LongJump.o \
+	SetJump.o RShiftU64.o RRotU64.o RRotU32.o MultU64x64.o MultU64x32.o MultS64x64.o ModU64x32.o \
+	LShiftU64.o LRotU64.o LRotU32.o LowBitSet64.o LowBitSet32.o HighBitSet64.o HighBitSet32.o \
+	GetPowerOfTwo64.o GetPowerOfTwo32.o DivU64x64Remainder.o DivU64x32Remainder.o DivU64x32.o \
+	DivS64x64Remainder.o ARShiftU64.o BitField.o CpuDeadLoop.o Cpu.o LinkedList.o SafeString.o \
+	String.o FilePaths.o
+
 
 LIBRARIES=OUTPUT/MemtestEfi.lib
 
@@ -112,35 +119,41 @@ UefiMemoryAllocationLib.o: memtest86+/efi/Include/src/MemoryAllocationLib.c
 	-I"memtest86+/efi/Include"
 
 UefiLib2.o: Acpi.o Console.o UefiDriverModel.o UefiLib.o UefiLibPrint.o UefiNotTiano.o
-	ld -r Acpi.o Console.o UefiDriverModel.o UefiLib.o UefiLibPrint.o UefiNotTiano.o -o UefiLib2.o
+	ld -r $< -o $@
 
 %.o: memtest86+/efi/Include/src/UefiDebugLibStdErr/%.c
 	$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \
 	-I"memtest86+/efi/Include"
 
 UefiDebugLibStdErr.o: DebugLib.o DebugLibConstructor.o
-	ld -r DebugLib.o DebugLibConstructor.o -o UefiDebugLibStdErr.o
+	ld -r $< -o $@
 
 %.o: memtest86+/efi/Include/src/BaseMemoryLib/%.c
 	$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \
 	-I"memtest86+/efi/Include"
 
 BaseMemoryLib.o: $(BaseMemoryLib_OBJS)
-	ld -r $(BaseMemoryLib_OBJS) -o BaseMemoryLib.o
+	ld -r $< -o $@
 
 %.o: memtest86+/efi/Include/src/BasePrintLib/%.c
 	$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \
 	-I"memtest86+/efi/Include"
 
 BasePrintLib.o: PrintLib.o PrintLibInternal.o
-	ld -r PrintLib.o PrintLibInternal.o -o BasePrintLib.o
+	ld -r $< -o $@
 
 %.o: memtest86+/efi/Include/src/UefiDevicePathLib/%.c
 	$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \
 	-I"memtest86+/efi/Include"
 
 UefiDevicePathLib2.o: $(UefiDevicePathLib_OBJS)
-	ld -r $(UefiDevicePathLib_OBJS) -o UefiDevicePathLib2.o
+	ld -r $< -o $@
+
+%.o: memtest86+/efi/Include/src/BaseLib/%.c
+	$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $<
+
+BaseLib.o: $(BaseLib_OBJS)
+	ld -r $< -o $@
 
 %.o: memtest86+/efi/%.c
 	$(CC) $(CFLAGS) $(PREPROCESSOR) $(M) -c -o $@ $< \
diff --git a/efi_memtest/memtest86+/efi/Include/src/BasePrintLib/PrintLibInternal.c b/efi_memtest/memtest86+/efi/Include/src/BasePrintLib/PrintLibInternal.c
index b540c23..3a3eaaa 100644
--- a/efi_memtest/memtest86+/efi/Include/src/BasePrintLib/PrintLibInternal.c
+++ b/efi_memtest/memtest86+/efi/Include/src/BasePrintLib/PrintLibInternal.c
@@ -7,6 +7,7 @@
 **/
 
 #include "PrintLibInternal.h"
+#include "Library/BaseLib.h"
 #include "AutoGen.h"
 
 #define WARNING_STATUS_NUMBER         5