From 446b3cc6f65a2a4b2992888e828fb73b0d18b7e6 Mon Sep 17 00:00:00 2001 From: Sergey Isakov Date: Tue, 24 Mar 2020 07:36:39 +0300 Subject: [PATCH] revert build_rule Signed-off-by: Sergey Isakov --- BaseTools/Conf/build_rule.template | 192 +++++++++++++++-------------- rEFIt_UEFI/libeg/XTheme.cpp | 55 ++++++--- rEFIt_UEFI/refit/lib.h | 6 + rEFIt_UEFI/refit/menu.cpp | 10 +- 4 files changed, 150 insertions(+), 113 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 9b6b24fce..da7af7e9c 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -119,16 +119,17 @@ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src} + @"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src} + @"echo" [CPP] ${s_base} # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues - "$(CC)" $(CXX_FLAGS) -c -o ${dst} $(INC) ${src} - "echo" [CPP] ${s_base} + @"$(CC)" $(CXX_FLAGS) -c -o ${dst} $(INC) ${src} + @"echo" [CPP] ${s_base} - "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src} - "echo" [CPP] ${s_base} + @"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src} + @"echo" [CPP] ${s_base} [C-Code-File] @@ -144,16 +145,17 @@ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src} + @"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src} + @"echo" [CPP] ${s_base} # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues - "$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src} - "echo" [CC] ${s_base} + @"$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src} + @"echo" [CC] ${s_base} - "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src} - "echo" [CC] ${s_base} + @"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src} + @"echo" [CC] ${s_base} [C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM] @@ -195,12 +197,12 @@ "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii - "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i + @"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i @Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i #--trim-long # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues - "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii - "echo" [ASM] ${s_base} + @"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii + @"echo" [ASM] ${s_base} [Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64] # Remove --convert-hex for ARM as it breaks MSFT assemblers @@ -243,10 +245,10 @@ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i + @"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i @Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i - "$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii - "echo" [NASM] ${s_base} + @"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii + @"echo" [NASM] ${s_base} [Device-Tree-Source-File] @@ -259,9 +261,9 @@ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb - "$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i - "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i - "echo" [DTC] ${s_base} + @"$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i + @"$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i + @"echo" [DTC] ${s_base} [Visual-Form-Representation-File] @@ -276,9 +278,9 @@ $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c - "$(VFRPP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_base}.i - "$(VFR)" $(VFR_FLAGS) --string-db $(OUTPUT_DIR)(+)$(MODULE_NAME)StrDefs.hpk --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_base}.i - "echo" [VFR] $(MODULE_NAME) + @"$(VFRPP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_base}.i + @"$(VFR)" $(VFR_FLAGS) --string-db $(OUTPUT_DIR)(+)$(MODULE_NAME)StrDefs.hpk --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_base}.i + @"echo" [VFR] $(MODULE_NAME) [Object-File] @@ -293,8 +295,8 @@ @$(RM) ${dst} - "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST) - "echo" [SLINK] $(MODULE_NAME) + @"$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST) + @"echo" [SLINK] $(MODULE_NAME) "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST) @@ -304,8 +306,8 @@ "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES) - "$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST) - "echo" [SLINK] $(MODULE_NAME) + @"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST) + @"echo" [SLINK] $(MODULE_NAME) [Static-Library-File] @@ -318,13 +320,14 @@ $(DEBUG_DIR)(+)$(MODULE_NAME).dll - "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) - "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) + @"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) + @"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) + @"echo" [DLINK1] $(MODULE_NAME) - "$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS) - "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} - "echo" [DLINK1] $(MODULE_NAME) + @"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS) + @"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} + @"echo" [DLINK1] $(MODULE_NAME) "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) @@ -334,8 +337,8 @@ "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS) - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) - "echo" [DLINK1] $(MODULE_NAME) + @"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) + @"echo" [DLINK1] $(MODULE_NAME) [Static-Library-File.SEC.AARCH64, Static-Library-File.PEI_CORE.AARCH64, Static-Library-File.PEIM.AARCH64,Static-Library-File.SEC.ARM, Static-Library-File.PEI_CORE.ARM, Static-Library-File.PEIM.ARM] @@ -364,11 +367,12 @@ $(DEBUG_DIR)(+)$(MODULE_NAME) - "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) + @"$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) + @"echo" [DLINK2] $(MODULE_NAME) - "$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS) - "echo" [DLINK2] $(MODULE_NAME) + @"$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS) + @"echo" [DLINK2] $(MODULE_NAME) "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) @@ -378,8 +382,8 @@ "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS) - "$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) - "echo" [DLINK2] $(MODULE_NAME) + @"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) + @"echo" [DLINK2] $(MODULE_NAME) [Dynamic-Library-File] @@ -390,11 +394,13 @@ $(OUTPUT_DIR)(+)$(MODULE_NAME).efi - "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) - $(CP) ${dst} $(DEBUG_DIR) - $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi + @"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) + @$(CP) ${dst} $(DEBUG_DIR) + @$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) + @"echo" [GENFW] $(MODULE_NAME) + @$(OBJCOPY) --only-keep-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug #@$(OBJCOPY) --strip-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug @@ -405,26 +411,26 @@ # @-$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src} $(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug - "echo" [OBJCOPY] $(MODULE_NAME) + @"echo" [OBJCOPY] $(MODULE_NAME) - "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) + @"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) @$(CP) ${dst} $(DEBUG_DIR) @$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) - "echo" [GENFW] $(MODULE_NAME) + @"echo" [GENFW] $(MODULE_NAME) # tool to convert Mach-O to PE/COFF #"$(STRIP)" ${src} - "$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff - "echo" [MTOC] $(MODULE_NAME) + @"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff + @"echo" [MTOC] $(MODULE_NAME) # create symbol file for GDB debug #@-$(DSYMUTIL) ${src} - "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS) + @"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS) @$(CP) ${dst} $(DEBUG_DIR) @$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) - "echo" [GENFW] $(MODULE_NAME) + @"echo" [GENFW] $(MODULE_NAME) [Dependency-Expression-File] @@ -437,10 +443,10 @@ $(MAKE_FILE) - "$(PP)" $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i + @"$(PP)" $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i @Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i @GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii - "echo" [DEPEX] $(MODULE_NAME) + @"echo" [DEPEX] $(MODULE_NAME) [Acpi-Source-Language-File] @@ -461,10 +467,10 @@ @Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i -i $(INC_LIST) ${src} "$(ASLPP)" $(ASLPP_FLAGS) $(INC) -I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii - "echo" [ASLPP] ${s_base} + @"echo" [ASLPP] ${s_base} @Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii - "$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii - "echo" [ASLBIN] ${s_base} + @"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii + @"echo" [ASLBIN] ${s_base} [C-Code-File.AcpiTable] @@ -477,16 +483,16 @@ $(MAKE_FILE) - "$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} - "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) + @"$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} + @"$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) - "$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src} - "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "echo" [ASLDLINK] ${s_base} - "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) - "echo" [GENFW] ${s_base} + @"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src} + @"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + @"echo" [ASLDLINK] ${s_base} + @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) + @"echo" [GENFW] ${s_base} [Acpi-Table-Code-File] @@ -499,27 +505,27 @@ $(MAKE_FILE) - "$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} - "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) + @"$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} + @"$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) - "$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src} - "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "echo" [ASLDLINK-ACPI] ${s_base} - "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) - "echo" [GENFW-ACPI] ${s_base} + @"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src} + @"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + @"echo" [ASLDLINK-ACPI] ${s_base} + @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) + @"echo" [GENFW-ACPI] ${s_base} - "echo" [ASLCC-ACPI] $(MODULE_NAME) - "$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} - "echo" [ASLDLINK-ACPI] $(MODULE_NAME) - "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj - "echo" [MTOC-ACPI] $(MODULE_NAME) + @"echo" [ASLCC-ACPI] $(MODULE_NAME) + @"$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} + @"echo" [ASLDLINK-ACPI] $(MODULE_NAME) + @"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + @"echo" [MTOC-ACPI] $(MODULE_NAME) #"$(STRIP)" ${src} - "$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.efi - "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS) - "echo" [GENFW-ACPI] $(MODULE_NAME) + @"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.efi + @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS) + @"echo" [GENFW-ACPI] $(MODULE_NAME) [Masm16-Code-File] @@ -540,19 +546,19 @@ "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,, - "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i + @"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i @Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i - "$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii - "$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj --end-group - "echo" [MASM] $(s_base) + @"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii + @"$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj --end-group + @"echo" [MASM] $(s_base) - "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i + @"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i @Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i - "$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii - "$(SLINK)" $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + @"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii + @"$(SLINK)" $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj @otool -t $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib | hex2bin.py ${dst} - "echo" [OTOOL] ${s_base} + @"echo" [OTOOL] ${s_base} [Nasm-to-Binary-Code-File] @@ -566,10 +572,10 @@ $(OUTPUT_DIR)(+)${s_base}.bin - "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i + @"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i @Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i - "$(NASM)" -I${s_path}(+) -l ${d_path}(+)${s_base}.lst $(NASMB_FLAGS) -o $dst ${d_path}(+)${s_base}.iii - "echo" [NASMB] ${s_base} + @"$(NASM)" -I${s_path}(+) -l ${d_path}(+)${s_base}.lst $(NASMB_FLAGS) -o $dst ${d_path}(+)${s_base}.iii + @"echo" [NASMB] ${s_base} # copy the output file with .com postfix that be same to the output file of .asm16 @$(CP) ${dst} $(OUTPUT_DIR)(+)${s_base}.com @@ -581,7 +587,7 @@ $(OUTPUT_DIR)(+)${s_base}.mcb - "$(GENFW)" -o ${dst} -m ${src} $(GENFW_FLAGS) + @"$(GENFW)" -o ${dst} -m ${src} $(GENFW_FLAGS) [Microcode-Binary-File] @@ -688,12 +694,12 @@ "$(RC)" /Fo${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc - "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) - "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} - "echo" [GENFW-HII] $(MODULE_NAME) + @"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) + @"$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} + @"echo" [GENFW-HII] $(MODULE_NAME) @GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) - "echo" [GENFW-HII] $(MODULE_NAME) + @"echo" [GENFW-HII] $(MODULE_NAME) diff --git a/rEFIt_UEFI/libeg/XTheme.cpp b/rEFIt_UEFI/libeg/XTheme.cpp index 55d8255b3..0cad5bdf4 100644 --- a/rEFIt_UEFI/libeg/XTheme.cpp +++ b/rEFIt_UEFI/libeg/XTheme.cpp @@ -11,6 +11,29 @@ extern "C" { #include "XTheme.h" +//temporary +extern INTN ScrollWidth; +extern INTN ScrollButtonsHeight; +extern INTN ScrollBarDecorationsHeight; +extern INTN ScrollScrollDecorationsHeight; + +extern EG_RECT UpButton; +extern EG_RECT DownButton; +extern EG_RECT BarStart; +extern EG_RECT BarEnd; +extern EG_RECT ScrollbarBackground; +extern EG_RECT Scrollbar; +extern EG_RECT ScrollStart; +extern EG_RECT ScrollEnd; +extern EG_RECT ScrollTotal; + +extern BOOLEAN IsDragging; +extern EG_RECT ScrollbarOldPointerPlace; +extern EG_RECT ScrollbarNewPointerPlace; +extern INTN ScrollbarYMovement; + + + CONST CHAR8* IconsNames[] = { "func_about", "func_options", @@ -498,21 +521,21 @@ void XTheme::InitSelection() //DECLARE_EMB_EXTERN_WITH_SIZE(emb_dark_font_data) - Status = Button[0].LoadXImage(ThemeDir, "radio_button"); + Status = Buttons[0].LoadXImage(ThemeDir, "radio_button"); if (EFI_ERROR(Status)) { - Button[0].FromPNG(ACCESS_EMB_DATA(emb_radio_button), ACCESS_EMB_SIZE(emb_radio_button)); + Buttons[0].FromPNG(ACCESS_EMB_DATA(emb_radio_button), ACCESS_EMB_SIZE(emb_radio_button)); } - Status = Button[1].LoadXImage(ThemeDir, "radio_button_selected"); + Status = Buttons[1].LoadXImage(ThemeDir, "radio_button_selected"); if (EFI_ERROR(Status)) { - Button[1].FromPNG(ACCESS_EMB_DATA(emb_radio_button_selected), ACCESS_EMB_SIZE(emb_radio_button_selected)); + Buttons[1].FromPNG(ACCESS_EMB_DATA(emb_radio_button_selected), ACCESS_EMB_SIZE(emb_radio_button_selected)); } - Status = Button[2].LoadXImage(ThemeDir, "checkbox"); + Status = Buttons[2].LoadXImage(ThemeDir, "checkbox"); if (EFI_ERROR(Status)) { - Button[2].FromPNG(ACCESS_EMB_DATA(emb_checkbox), ACCESS_EMB_SIZE(emb_checkbox)); + Buttons[2].FromPNG(ACCESS_EMB_DATA(emb_checkbox), ACCESS_EMB_SIZE(emb_checkbox)); } - Status = Button[3].LoadXImage(ThemeDir, "checkbox_checked"); + Status = Buttons[3].LoadXImage(ThemeDir, "checkbox_checked"); if (EFI_ERROR(Status)) { - Button[3].FromPNG(ACCESS_EMB_DATA(emb_checkbox_checked), ACCESS_EMB_SIZE(emb_checkbox_checked)); + Buttons[3].FromPNG(ACCESS_EMB_DATA(emb_checkbox_checked), ACCESS_EMB_SIZE(emb_checkbox_checked)); } // non-selected background images @@ -552,7 +575,7 @@ void XTheme::FillByDir() //assume ThemeDir is defined by InitTheme() procedure //load banner and background Banner.LoadXImage(ThemeDir, BannerFileName); - BigBack.LoadXImage(ThemeDir, BackgroundFileName); + BigBack.LoadXImage(ThemeDir, BackgroundName); } @@ -579,7 +602,7 @@ void XTheme::InitBar() if (ScrollbarBackgroundImage.isEmpty()) { if (TypeSVG) { //return OSIconsTable[i].image; - ScrollbarBackgroundImage.GetIcon("scrollbar_background"); + ScrollbarBackgroundImage = GetIcon("scrollbar_background"); } if (ScrollbarBackgroundImage.isEmpty()) { ScrollbarBackgroundImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_bar_fill), ACCESS_EMB_SIZE(emb_scroll_bar_fill)); @@ -587,7 +610,7 @@ void XTheme::InitBar() } if (ScrollbarImage.isEmpty()) { if (TypeSVG) { - ScrollbarImage.GetIcon(ThemeDir, "scrollbar_holder"); //"_night" is already accounting + ScrollbarImage = GetIcon("scrollbar_holder"); //"_night" is already accounting } if (ScrollbarImage.isEmpty()) { ScrollbarImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_scroll_fill), ACCESS_EMB_SIZE(emb_scroll_scroll_fill)); @@ -595,7 +618,7 @@ void XTheme::InitBar() } if (ScrollStartImage.isEmpty()) { if (TypeSVG) { - ScrollStartImage.GetIcon(ThemeDir, "scrollbar_start"); + ScrollStartImage = GetIcon("scrollbar_start"); } if (ScrollStartImage.isEmpty()) { ScrollStartImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_scroll_start), ACCESS_EMB_SIZE(emb_scroll_scroll_start)); @@ -603,7 +626,7 @@ void XTheme::InitBar() } if (ScrollEndImage.isEmpty()) { if (TypeSVG) { - ScrollEndImage.GetIcon(ThemeDir, "scrollbar_end"); + ScrollEndImage = GetIcon("scrollbar_end"); } if (ScrollEndImage.isEmpty()) { ScrollEndImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_scroll_end), ACCESS_EMB_SIZE(emb_scroll_scroll_end)); @@ -611,18 +634,20 @@ void XTheme::InitBar() } if (UpButtonImage.isEmpty()) { if (TypeSVG) { - UpButtonImage.GetIcon(ThemeDir, "scrollbar_up_button"); + UpButtonImage = GetIcon("scrollbar_up_button"); } UpButtonImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_up_button), ACCESS_EMB_SIZE(emb_scroll_up_button)); } if (DownButtonImage.isEmpty()) { if (TypeSVG) { - DownButtonImage.GetIcon(ThemeDir, "scrollbar_down_button"); + DownButtonImage = GetIcon("scrollbar_down_button"); } if (DownButtonImage.isEmpty()) { DownButtonImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_down_button), ACCESS_EMB_SIZE(emb_scroll_down_button)); } } + + //TODO it must be somewhere in InitScroll - Scrfeen function if (!TypeSVG) { UpButton.Width = ScrollWidth; // 16 UpButton.Height = ScrollButtonsHeight; // 20 diff --git a/rEFIt_UEFI/refit/lib.h b/rEFIt_UEFI/refit/lib.h index a7782aa10..01031dcf5 100644 --- a/rEFIt_UEFI/refit/lib.h +++ b/rEFIt_UEFI/refit/lib.h @@ -330,8 +330,14 @@ typedef struct { //extern BOOLEAN ScrollEnabled; extern EG_RECT UpButton; extern EG_RECT DownButton; +extern EG_RECT BarStart; +extern EG_RECT BarEnd; extern EG_RECT ScrollbarBackground; extern EG_RECT Scrollbar; +extern EG_RECT ScrollStart; +extern EG_RECT ScrollEnd; +extern EG_RECT ScrollTotal; + extern BOOLEAN IsDragging; extern EG_RECT ScrollbarOldPointerPlace; extern EG_RECT ScrollbarNewPointerPlace; diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp index 9896abe95..237c4e736 100644 --- a/rEFIt_UEFI/refit/menu.cpp +++ b/rEFIt_UEFI/refit/menu.cpp @@ -182,11 +182,11 @@ static EG_IMAGE* BarStartImage = NULL; static EG_IMAGE* BarEndImage = NULL; static EG_IMAGE* ScrollStartImage = NULL; static EG_IMAGE* ScrollEndImage = NULL; -static EG_RECT BarStart; -static EG_RECT BarEnd; -static EG_RECT ScrollStart; -static EG_RECT ScrollEnd; -static EG_RECT ScrollTotal; +EG_RECT BarStart; +EG_RECT BarEnd; +EG_RECT ScrollStart; +EG_RECT ScrollEnd; +EG_RECT ScrollTotal; EG_RECT UpButton; EG_RECT DownButton; EG_RECT ScrollbarBackground;