Changeset 77662 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/vbox-tools_def.txt

Timestamp:

Mar 12, 2019 12:40:12 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129295

Message:

EFI: First step in UDK2018 merge. Does not build yet.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• vbox-tools_def.txt (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/vbox-tools_def.txt

@@ -83 +83 @@
 #                             Required to build platforms or ACPI tables:
 #                               Intel(r) ACPI Compiler (iasl.exe) v20101013 from
-#                               http://www.acpica.org/downloads/previous_releases.php 
+#                               http://www.acpica.org/downloads/previous_releases.php
 #
 ####################################################################################
@@ -132 +132 @@
 # IA32 definitions
 ##################
-*_VS2010_IA32_*_DLL             = DEF(VS2010_DLL)
-
-*_VS2010_IA32_MAKE_PATH         = DEF(VS2010_BIN)/nmake.exe
-*_VS2010_IA32_CC_PATH           = DEF(VS2010_BIN)/cl.exe
-*_VS2010_IA32_VFRPP_PATH        = DEF(VS2010_BIN)/cl.exe
-*_VS2010_IA32_SLINK_PATH        = DEF(VS2010_BIN)/lib.exe
-*_VS2010_IA32_DLINK_PATH        = DEF(VS2010_BIN)/link.exe
-*_VS2010_IA32_APP_PATH          = DEF(VS2010_BIN)/cl.exe
-*_VS2010_IA32_PP_PATH           = DEF(VS2010_BIN)/cl.exe
-*_VS2010_IA32_ASM_PATH          = DEF(VS2010_BIN)/ml.exe
-*_VS2010_IA32_ASLCC_PATH        = DEF(VS2010_BIN)/cl.exe
-*_VS2010_IA32_ASLPP_PATH        = DEF(VS2010_BIN)/cl.exe
-*_VS2010_IA32_ASLDLINK_PATH     = DEF(VS2010_BIN)/link.exe
-
-      *_VS2010_IA32_MAKE_FLAGS  = /nologo
-  DEBUG_VS2010_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2s /Oy- /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
-RELEASE_VS2010_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2s /Oy- /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi
-NOOPT_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
-
-  DEBUG_VS2010_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
-RELEASE_VS2010_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
-NOOPT_VS2010_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
-
-  DEBUG_VS2010_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_VS2010_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /IGNORE:4254 /MERGE:.data=.text /MERGE:.rdata=.text
-NOOPT_VS2010_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+*_VS2010_IA32_*_DLL               = DEF(VS2010_DLL)
+
+*_VS2010_IA32_MAKE_PATH           = DEF(VS2010_BIN)/nmake.exe
+*_VS2010_IA32_CC_PATH             = DEF(VS2010_BIN)/cl.exe
+*_VS2010_IA32_VFRPP_PATH          = DEF(VS2010_BIN)/cl.exe
+*_VS2010_IA32_SLINK_PATH          = DEF(VS2010_BIN)/lib.exe
+*_VS2010_IA32_DLINK_PATH          = DEF(VS2010_BIN)/link.exe
+*_VS2010_IA32_APP_PATH            = DEF(VS2010_BIN)/cl.exe
+*_VS2010_IA32_PP_PATH             = DEF(VS2010_BIN)/cl.exe
+*_VS2010_IA32_ASM_PATH            = DEF(VS2010_BIN)/ml.exe
+*_VS2010_IA32_ASLCC_PATH          = DEF(VS2010_BIN)/cl.exe
+*_VS2010_IA32_ASLPP_PATH          = DEF(VS2010_BIN)/cl.exe
+*_VS2010_IA32_ASLDLINK_PATH       = DEF(VS2010_BIN)/link.exe
+
+      *_VS2010_IA32_MAKE_FLAGS    = /nologo
+  DEBUG_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+RELEASE_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2s /Oy- /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi
+#UDK RELEASE_VS2010_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010_IA32_CC_FLAGS        = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od
+
+  DEBUG_VS2010_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+RELEASE_VS2010_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd
+NOOPT_VS2010_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+
+# yasm does not like plain -g option, needs format type
+  DEBUG_VS2010_IA32_NASM_FLAGS    = -Ox -f win32 -g cv8
+RELEASE_VS2010_IA32_NASM_FLAGS    = -Ox -f win32
+NOOPT_VS2010_IA32_NASM_FLAGS      = -O0 -f win32 -g cv8
+
+  DEBUG_VS2010_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
+NOOPT_VS2010_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
 
 ##################
@@ -163 +169 @@
 ##################
 *_VS2010_X64_*_DLL              = DEF(VS2010_BINX64);DEF(VS2010_DLL)
-                                
+
 *_VS2010_X64_CC_PATH            = DEF(VS2010_BINX64)/cl.exe
 *_VS2010_X64_PP_PATH            = DEF(VS2010_BINX64)/cl.exe
@@ -175 +181 @@
 *_VS2010_X64_ASLDLINK_PATH      = DEF(VS2010_BINX64)/link.exe
 
-  DEBUG_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2s /Oy- /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+  DEBUG_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2s /Oy- /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi
+#UDK RELEASE_VS2010_X64_CC_FLAGS= /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2010_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
 
   DEBUG_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
-NOOPT_VS2010_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi
+RELEASE_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd
+NOOPT_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
+
+# yasm does not like plain -g option, needs format type
+  DEBUG_VS2010_X64_NASM_FLAGS   = -Ox -f win64 -g cv8
+RELEASE_VS2010_X64_NASM_FLAGS   = -Ox -f win64
+NOOPT_VS2010_X64_NASM_FLAGS     = -O0 -f win64 -g cv8
 
   DEBUG_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /IGNORE:4254 /MERGE:.data=.text /MERGE:.rdata=.text
-NOOPT_VS2010_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
+NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
 
 
@@ -356 +368 @@
 *_*_*_NASMB_FLAGS              = -f bin -D__YASM__ -DASM_FORMAT_BIN -DVBOX
 
+#################
+# Build rule order
+#################
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s nasmb asm16