fix conf.templates

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-02-17 11:03:09 +03:00
parent b71081dc85
commit 5d2a7f34d1
4 changed files with 29 additions and 6 deletions

View File

@ -106,15 +106,36 @@
# build_rule_version=0.1 # build_rule_version=0.1
# #
[Cxx-Code-File]
<InputFile>
?.cpp
?.Cpp
?.CPP
<ExtraDependency>
$(MAKE_FILE)
<OutputFile>
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.MSFT, Command.INTEL>
"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
<Command.GCC, Command.RVCT>
# For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
@"$(CC)" $(CXX_FLAGS) -c -o ${dst} $(INC) ${src}
@"echo" [CPP] ${s_base}
<Command.XCODE>
@"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
@"echo" [CPP] ${s_base}
[C-Code-File] [C-Code-File]
<InputFile> <InputFile>
?.c ?.c
?.C ?.C
?.cc ?.cc
?.CC ?.CC
?.cpp
?.Cpp
?.CPP
<ExtraDependency> <ExtraDependency>
$(MAKE_FILE) $(MAKE_FILE)
@ -297,6 +318,7 @@
$(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) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
<Command.GCC> <Command.GCC>
@ -496,7 +518,7 @@
@"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}.efi $(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)

View File

@ -51,7 +51,7 @@ TOOL_CHAIN_CONF = Conf/tools_def.txt
# TAGNAME List Optional Specify the name(s) of the tools_def.txt TagName to use. # TAGNAME List Optional Specify the name(s) of the tools_def.txt TagName to use.
# If not specified, all applicable TagName tools will be # If not specified, all applicable TagName tools will be
# used for the build. The list uses space character separation. # used for the build. The list uses space character separation.
TOOL_CHAIN_TAG = VS2015x86 TOOL_CHAIN_TAG = VS2017
# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. If not specified or set # MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. If not specified or set
# to zero, tool automatically detect number of processor # to zero, tool automatically detect number of processor

View File

@ -2408,6 +2408,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
*_GCC53_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS),-m,elf_x86_64 *_GCC53_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS),-m,elf_x86_64
*_GCC53_X64_ASM_FLAGS = DEF(GCC53_ASM_FLAGS) -m64 *_GCC53_X64_ASM_FLAGS = DEF(GCC53_ASM_FLAGS) -m64
*_GCC53_X64_CC_FLAGS = DEF(GCC53_X64_CC_FLAGS) ENV(GCC53_X64_EXTRA_CC_FLAGS) *_GCC53_X64_CC_FLAGS = DEF(GCC53_X64_CC_FLAGS) ENV(GCC53_X64_EXTRA_CC_FLAGS)
*_GCC53_X64_CXX_FLAGS = DEF(GCC53_X64_CC_FLAGS) ENV(GCC53_X64_EXTRA_CC_FLAGS)
*_GCC53_X64_DLINK_FLAGS = DEF(GCC53_X64_DLINK_FLAGS) DEF(GCC53_X64_CC_FLAGS) ENV(GCC53_X64_EXTRA_CC_FLAGS) *_GCC53_X64_DLINK_FLAGS = DEF(GCC53_X64_DLINK_FLAGS) DEF(GCC53_X64_CC_FLAGS) ENV(GCC53_X64_EXTRA_CC_FLAGS)
*_GCC53_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC53_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_GCC53_X64_OBJCOPY_FLAGS = *_GCC53_X64_OBJCOPY_FLAGS =

View File

@ -2830,7 +2830,7 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F
################## ##################
# NASM tool definitions # NASM tool definitions
################## ##################
*_*_*_NASM_PATH = ENV(NASM_PREFIX)\nasm *_*_*_NASM_PATH = ENV(NASM_PREFIX)/nasm
# NASMB uses NASM produce a .bin from a .nasmb NASM source file # NASMB uses NASM produce a .bin from a .nasmb NASM source file
*_*_*_NASMB_FLAGS = -f bin *_*_*_NASMB_FLAGS = -f bin