Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert build_rule

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-03-24 07:36:39 +03:00
parent a3f3053c30
commit 446b3cc6f6
4 changed files with 150 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
BaseTools/Conf/build_rule.template
View File

@ -119,16 +119,17 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.MSFT, Command.INTEL> <Command.MSFT, Command.INTEL>
"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src} @"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
@"echo" [CPP] ${s_base}
<Command.GCC, Command.RVCT> <Command.GCC, Command.RVCT>
# For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
"$(CC)" $(CXX_FLAGS) -c -o ${dst} $(INC) ${src} @"$(CC)" $(CXX_FLAGS) -c -o ${dst} $(INC) ${src}
"echo" [CPP] ${s_base} @"echo" [CPP] ${s_base}
<Command.XCODE> <Command.XCODE>
"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src} @"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
"echo" [CPP] ${s_base} @"echo" [CPP] ${s_base}
[C-Code-File] [C-Code-File]
<InputFile> <InputFile>
@ -144,16 +145,17 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.MSFT, Command.INTEL> <Command.MSFT, Command.INTEL>
"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src} @"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
@"echo" [CPP] ${s_base}
<Command.GCC, Command.RVCT> <Command.GCC, Command.RVCT>
# For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
"$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src} @"$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src}
"echo" [CC] ${s_base} @"echo" [CC] ${s_base}
<Command.XCODE> <Command.XCODE>
"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src} @"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
"echo" [CC] ${s_base} @"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] [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]
<InputFile> <InputFile>
@ -195,12 +197,12 @@
"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
<Command.GCC, Command.RVCT> <Command.GCC, Command.RVCT>
"$(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 --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
#--trim-long #--trim-long
# For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii @"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
"echo" [ASM] ${s_base} @"echo" [ASM] ${s_base}
[Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64] [Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64]
# Remove --convert-hex for ARM as it breaks MSFT assemblers # Remove --convert-hex for ARM as it breaks MSFT assemblers
@ -243,10 +245,10 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command> <Command>
"$(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 @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 @"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
"echo" [NASM] ${s_base} @"echo" [NASM] ${s_base}
[Device-Tree-Source-File] [Device-Tree-Source-File]
<InputFile> <InputFile>
@ -259,9 +261,9 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb
<Command.GCC> <Command.GCC>
"$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i @"$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
"$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i @"$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
"echo" [DTC] ${s_base} @"echo" [DTC] ${s_base}
[Visual-Form-Representation-File] [Visual-Form-Representation-File]
<InputFile> <InputFile>
@ -276,9 +278,9 @@
$(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c
<Command> <Command>
"$(VFRPP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_base}.i @"$(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 @"$(VFR)" $(VFR_FLAGS) --string-db $(OUTPUT_DIR)(+)$(MODULE_NAME)StrDefs.hpk --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_base}.i
"echo" [VFR] $(MODULE_NAME) @"echo" [VFR] $(MODULE_NAME)
[Object-File] [Object-File]
<InputFile> <InputFile>
@ -293,8 +295,8 @@
<Command.GCC> <Command.GCC>
@$(RM) ${dst} @$(RM) ${dst}
"$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST) @"$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)
"echo" [SLINK] $(MODULE_NAME) @"echo" [SLINK] $(MODULE_NAME)
<Command.RVCT> <Command.RVCT>
"$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST) "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)
@ -304,8 +306,8 @@
"$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES) "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)
<Command.XCODE> <Command.XCODE>
"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST) @"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)
"echo" [SLINK] $(MODULE_NAME) @"echo" [SLINK] $(MODULE_NAME)
[Static-Library-File] [Static-Library-File]
<InputFile> <InputFile>
@ -318,13 +320,14 @@
$(DEBUG_DIR)(+)$(MODULE_NAME).dll $(DEBUG_DIR)(+)$(MODULE_NAME).dll
<Command.MSFT, Command.INTEL> <Command.MSFT, Command.INTEL>
"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_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) @"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
@"echo" [DLINK1] $(MODULE_NAME)
<Command.GCC> <Command.GCC>
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS) @"$(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} @"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
"echo" [DLINK1] $(MODULE_NAME) @"echo" [DLINK1] $(MODULE_NAME)
<Command.RVCT> <Command.RVCT>
"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) "$(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) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
<Command.XCODE> <Command.XCODE>
"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) @"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
"echo" [DLINK1] $(MODULE_NAME) @"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] [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) $(DEBUG_DIR)(+)$(MODULE_NAME)
<Command.MSFT, Command.INTEL> <Command.MSFT, Command.INTEL>
"$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) @"$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
@"echo" [DLINK2] $(MODULE_NAME)
<Command.GCC> <Command.GCC>
"$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS) @"$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS)
"echo" [DLINK2] $(MODULE_NAME) @"echo" [DLINK2] $(MODULE_NAME)
<Command.RVCT> <Command.RVCT>
"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) "$(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)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
<Command.XCODE> <Command.XCODE>
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) @"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
"echo" [DLINK2] $(MODULE_NAME) @"echo" [DLINK2] $(MODULE_NAME)
[Dynamic-Library-File] [Dynamic-Library-File]
@ -390,11 +394,13 @@
$(OUTPUT_DIR)(+)$(MODULE_NAME).efi $(OUTPUT_DIR)(+)$(MODULE_NAME).efi
<Command.MSFT, Command.INTEL, Command.RVCT> <Command.MSFT, Command.INTEL, Command.RVCT>
"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) @"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
$(CP) ${dst} $(DEBUG_DIR) @$(CP) ${dst} $(DEBUG_DIR)
$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
-$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR)
@"echo" [GENFW] $(MODULE_NAME)
<Command.GCC> <Command.GCC>
@$(OBJCOPY) --only-keep-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug @$(OBJCOPY) --only-keep-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
#@$(OBJCOPY) --strip-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug #@$(OBJCOPY) --strip-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
@ -405,26 +411,26 @@
# #
@-$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src} @-$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}
$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug $(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} $(DEBUG_DIR)
@$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
@-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) @-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
"echo" [GENFW] $(MODULE_NAME) @"echo" [GENFW] $(MODULE_NAME)
<Command.XCODE> <Command.XCODE>
# tool to convert Mach-O to PE/COFF # tool to convert Mach-O to PE/COFF
#"$(STRIP)" ${src} #"$(STRIP)" ${src}
"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff @"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff
"echo" [MTOC] $(MODULE_NAME) @"echo" [MTOC] $(MODULE_NAME)
# create symbol file for GDB debug # create symbol file for GDB debug
#@-$(DSYMUTIL) ${src} #@-$(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} $(DEBUG_DIR)
@$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
@-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) @-$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
"echo" [GENFW] $(MODULE_NAME) @"echo" [GENFW] $(MODULE_NAME)
[Dependency-Expression-File] [Dependency-Expression-File]
<InputFile> <InputFile>
@ -437,10 +443,10 @@
$(MAKE_FILE) $(MAKE_FILE)
<Command> <Command>
"$(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 @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 @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] [Acpi-Source-Language-File]
<InputFile> <InputFile>
@ -461,10 +467,10 @@
<Command.GCC> <Command.GCC>
@Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i -i $(INC_LIST) ${src} @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 "$(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 @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 @"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii
"echo" [ASLBIN] ${s_base} @"echo" [ASLBIN] ${s_base}
[C-Code-File.AcpiTable] [C-Code-File.AcpiTable]
<InputFile> <InputFile>
@ -477,16 +483,16 @@
$(MAKE_FILE) $(MAKE_FILE)
<Command.MSFT, Command.INTEL> <Command.MSFT, Command.INTEL>
"$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} @"$(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 @"$(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) @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
<Command.GCC> <Command.GCC>
"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src} @"$(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 @"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
"echo" [ASLDLINK] ${s_base} @"echo" [ASLDLINK] ${s_base}
"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
"echo" [GENFW] ${s_base} @"echo" [GENFW] ${s_base}
[Acpi-Table-Code-File] [Acpi-Table-Code-File]
<InputFile> <InputFile>
@ -499,27 +505,27 @@
$(MAKE_FILE) $(MAKE_FILE)
<Command.MSFT, Command.INTEL> <Command.MSFT, Command.INTEL>
"$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} @"$(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 @"$(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) @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
<Command.GCC> <Command.GCC>
"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src} @"$(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 @"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
"echo" [ASLDLINK-ACPI] ${s_base} @"echo" [ASLDLINK-ACPI] ${s_base}
"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS) @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
"echo" [GENFW-ACPI] ${s_base} @"echo" [GENFW-ACPI] ${s_base}
<Command.XCODE> <Command.XCODE>
"echo" [ASLCC-ACPI] $(MODULE_NAME) @"echo" [ASLCC-ACPI] $(MODULE_NAME)
"$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src} @"$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FLAGS) $(INC) ${src}
"echo" [ASLDLINK-ACPI] $(MODULE_NAME) @"echo" [ASLDLINK-ACPI] $(MODULE_NAME)
"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj @"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
"echo" [MTOC-ACPI] $(MODULE_NAME) @"echo" [MTOC-ACPI] $(MODULE_NAME)
#"$(STRIP)" ${src} #"$(STRIP)" ${src}
"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.efi @"$(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) @"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS)
"echo" [GENFW-ACPI] $(MODULE_NAME) @"echo" [GENFW-ACPI] $(MODULE_NAME)
[Masm16-Code-File] [Masm16-Code-File]
@ -540,19 +546,19 @@
"$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,, "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,
<Command.GCC> <Command.GCC>
"$(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 --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 @"$(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 @"$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj --end-group
"echo" [MASM] $(s_base) @"echo" [MASM] $(s_base)
<Command.XCODE> <Command.XCODE>
"$(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 --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 @"$(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 @"$(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} @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] [Nasm-to-Binary-Code-File]
@ -566,10 +572,10 @@
$(OUTPUT_DIR)(+)${s_base}.bin $(OUTPUT_DIR)(+)${s_base}.bin
<Command> <Command>
"$(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 @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 @"$(NASM)" -I${s_path}(+) -l ${d_path}(+)${s_base}.lst $(NASMB_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
"echo" [NASMB] ${s_base} @"echo" [NASMB] ${s_base}
# copy the output file with .com postfix that be same to the output file of .asm16 # copy the output file with .com postfix that be same to the output file of .asm16
@$(CP) ${dst} $(OUTPUT_DIR)(+)${s_base}.com @$(CP) ${dst} $(OUTPUT_DIR)(+)${s_base}.com
@ -581,7 +587,7 @@
$(OUTPUT_DIR)(+)${s_base}.mcb $(OUTPUT_DIR)(+)${s_base}.mcb
<Command> <Command>
"$(GENFW)" -o ${dst} -m ${src} $(GENFW_FLAGS) @"$(GENFW)" -o ${dst} -m ${src} $(GENFW_FLAGS)
[Microcode-Binary-File] [Microcode-Binary-File]
<InputFile> <InputFile>
@ -688,12 +694,12 @@
"$(RC)" /Fo${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc "$(RC)" /Fo${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
<Command.GCC> <Command.GCC>
"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) @"$(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} @"$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}
"echo" [GENFW-HII] $(MODULE_NAME) @"echo" [GENFW-HII] $(MODULE_NAME)
<Command.XCODE, Command.RVCT> <Command.XCODE, Command.RVCT>
@GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) @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)

55
rEFIt_UEFI/libeg/XTheme.cpp
View File

@ -11,6 +11,29 @@ extern "C" {
#include "XTheme.h" #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[] = { CONST CHAR8* IconsNames[] = {
"func_about", "func_about",
"func_options", "func_options",
@ -498,21 +521,21 @@ void XTheme::InitSelection()
//DECLARE_EMB_EXTERN_WITH_SIZE(emb_dark_font_data) //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)) { 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)) { 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)) { 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)) { 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 // non-selected background images
@ -552,7 +575,7 @@ void XTheme::FillByDir() //assume ThemeDir is defined by InitTheme() procedure
//load banner and background //load banner and background
Banner.LoadXImage(ThemeDir, BannerFileName); Banner.LoadXImage(ThemeDir, BannerFileName);
BigBack.LoadXImage(ThemeDir, BackgroundFileName); BigBack.LoadXImage(ThemeDir, BackgroundName);
} }
@ -579,7 +602,7 @@ void XTheme::InitBar()
if (ScrollbarBackgroundImage.isEmpty()) { if (ScrollbarBackgroundImage.isEmpty()) {
if (TypeSVG) { if (TypeSVG) {
//return OSIconsTable[i].image; //return OSIconsTable[i].image;
ScrollbarBackgroundImage.GetIcon("scrollbar_background"); ScrollbarBackgroundImage = GetIcon("scrollbar_background");
} }
if (ScrollbarBackgroundImage.isEmpty()) { if (ScrollbarBackgroundImage.isEmpty()) {
ScrollbarBackgroundImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_bar_fill), ACCESS_EMB_SIZE(emb_scroll_bar_fill)); 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 (ScrollbarImage.isEmpty()) {
if (TypeSVG) { if (TypeSVG) {
ScrollbarImage.GetIcon(ThemeDir, "scrollbar_holder"); //"_night" is already accounting ScrollbarImage = GetIcon("scrollbar_holder"); //"_night" is already accounting
} }
if (ScrollbarImage.isEmpty()) { if (ScrollbarImage.isEmpty()) {
ScrollbarImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_scroll_fill), ACCESS_EMB_SIZE(emb_scroll_scroll_fill)); 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 (ScrollStartImage.isEmpty()) {
if (TypeSVG) { if (TypeSVG) {
ScrollStartImage.GetIcon(ThemeDir, "scrollbar_start"); ScrollStartImage = GetIcon("scrollbar_start");
} }
if (ScrollStartImage.isEmpty()) { if (ScrollStartImage.isEmpty()) {
ScrollStartImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_scroll_start), ACCESS_EMB_SIZE(emb_scroll_scroll_start)); 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 (ScrollEndImage.isEmpty()) {
if (TypeSVG) { if (TypeSVG) {
ScrollEndImage.GetIcon(ThemeDir, "scrollbar_end"); ScrollEndImage = GetIcon("scrollbar_end");
} }
if (ScrollEndImage.isEmpty()) { if (ScrollEndImage.isEmpty()) {
ScrollEndImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_scroll_end), ACCESS_EMB_SIZE(emb_scroll_scroll_end)); 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 (UpButtonImage.isEmpty()) {
if (TypeSVG) { 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)); UpButtonImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_up_button), ACCESS_EMB_SIZE(emb_scroll_up_button));
} }
if (DownButtonImage.isEmpty()) { if (DownButtonImage.isEmpty()) {
if (TypeSVG) { if (TypeSVG) {
DownButtonImage.GetIcon(ThemeDir, "scrollbar_down_button"); DownButtonImage = GetIcon("scrollbar_down_button");
} }
if (DownButtonImage.isEmpty()) { if (DownButtonImage.isEmpty()) {
DownButtonImage.FromPNG(ACCESS_EMB_DATA(emb_scroll_down_button), ACCESS_EMB_SIZE(emb_scroll_down_button)); 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) { if (!TypeSVG) {
UpButton.Width = ScrollWidth; // 16 UpButton.Width = ScrollWidth; // 16
UpButton.Height = ScrollButtonsHeight; // 20 UpButton.Height = ScrollButtonsHeight; // 20

6
rEFIt_UEFI/refit/lib.h
View File

@ -330,8 +330,14 @@ typedef struct {
//extern BOOLEAN ScrollEnabled; //extern BOOLEAN ScrollEnabled;
extern EG_RECT UpButton; extern EG_RECT UpButton;
extern EG_RECT DownButton; extern EG_RECT DownButton;
extern EG_RECT BarStart;
extern EG_RECT BarEnd;
extern EG_RECT ScrollbarBackground; extern EG_RECT ScrollbarBackground;
extern EG_RECT Scrollbar; extern EG_RECT Scrollbar;
extern EG_RECT ScrollStart;
extern EG_RECT ScrollEnd;
extern EG_RECT ScrollTotal;
extern BOOLEAN IsDragging; extern BOOLEAN IsDragging;
extern EG_RECT ScrollbarOldPointerPlace; extern EG_RECT ScrollbarOldPointerPlace;
extern EG_RECT ScrollbarNewPointerPlace; extern EG_RECT ScrollbarNewPointerPlace;

10
rEFIt_UEFI/refit/menu.cpp
View File

@ -182,11 +182,11 @@ static EG_IMAGE* BarStartImage = NULL;
static EG_IMAGE* BarEndImage = NULL; static EG_IMAGE* BarEndImage = NULL;
static EG_IMAGE* ScrollStartImage = NULL; static EG_IMAGE* ScrollStartImage = NULL;
static EG_IMAGE* ScrollEndImage = NULL; static EG_IMAGE* ScrollEndImage = NULL;
static EG_RECT BarStart; EG_RECT BarStart;
static EG_RECT BarEnd; EG_RECT BarEnd;
static EG_RECT ScrollStart; EG_RECT ScrollStart;
static EG_RECT ScrollEnd; EG_RECT ScrollEnd;
static EG_RECT ScrollTotal; EG_RECT ScrollTotal;
EG_RECT UpButton; EG_RECT UpButton;
EG_RECT DownButton; EG_RECT DownButton;
EG_RECT ScrollbarBackground; EG_RECT ScrollbarBackground;