diff options
| author | Regina König | 2020-12-10 17:43:41 +0100 |
|---|---|---|
| committer | Regina König | 2020-12-10 17:43:41 +0100 |
| commit | 092ba15b9528b2055b3b5b6e61a318e2d1d3fe0c (patch) | |
| tree | 307f9d1c22ff67527af7db79f29c43e1cde19e6e /efi_memtest/Makefile | |
| parent | Removed unnecessary GUID (for INF file) (diff) | |
| download | memtest86-092ba15b9528b2055b3b5b6e61a318e2d1d3fe0c.tar.gz memtest86-092ba15b9528b2055b3b5b6e61a318e2d1d3fe0c.tar.xz memtest86-092ba15b9528b2055b3b5b6e61a318e2d1d3fe0c.zip | |
Removed static_library_files.lst and added all libs in Makefile
Diffstat (limited to 'efi_memtest/Makefile')
| -rw-r--r-- | efi_memtest/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/efi_memtest/Makefile b/efi_memtest/Makefile index 88605df..aa1a39d 100644 --- a/efi_memtest/Makefile +++ b/efi_memtest/Makefile @@ -33,6 +33,14 @@ OBJS=AutoGen.obj main.o display.o test.o smp.o config.o screen_buffer.o lib.o in 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 +LIBS_PATH=memtest86+/efi/Include/libs + +LIBRARIES=OUTPUT/MemtestEfi.lib $(addprefix $(LIBS_PATH)/, BaseDebugPrintErrorLevelLib.lib \ + BaseLib.lib BaseMemoryLib.lib BasePcdLibNull.lib BasePrintLib.lib UefiApplicationEntryPoint.lib \ + UefiBootServicesTableLib.lib UefiDebugLibStdErr.lib UefiDevicePathLib.lib UefiLib.lib \ + UefiMemoryAllocationLib.lib UefiRuntimeServicesTableLib.lib) + + # STATIC_LIBRARY_FILES= libs/BaseLib.lib # libs/BaseMemoryLib.lib libs/BasePcdLibNull.lib @@ -55,16 +63,17 @@ $(MAIN_FILE).dll: $(MAIN_FILE).lib -Wl,--entry,_ModuleEntryPoint \ -Wl,-Map,$(MAIN_FILE).map,--whole-archive \ -Wl,-melf_x86_64,--oformat=elf64-x86-64,-pie \ - -Wl,--start-group,@static_library_files.lst,--end-group \ -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 \ -Wl,--script=memtest86+/efi/Include/GccBase.lds \ -z common-page-size=0x40 \ -u _ModuleEntryPoint \ -DSTRING_ARRAY_NAME=${MAIN_FILE}Strings \ - -I OUTPUT/ \ - -I Library/ + $(LIBRARIES) objcopy --strip-unneeded -R .eh_frame -v $(MAIN_FILE).dll $(MAIN_FILE).dll + +# -Wl,--start-group,@static_library_files.lst,--end-group \ + $(MAIN_FILE).lib: $(OBJS) gcc-ar crv OUTPUT/$(MAIN_FILE).lib $(OBJS) |