X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FRegularExpressionDxe%2FRegularExpressionDxe.inf;h=7490a03c5c116ac1331712016f0cab4d82fb7c87;hb=b602265d559b2f2ade4d09ba55652c23922c141f;hp=d8a14900210749e8697ab1148346efe3e719fc6b;hpb=d1102dba7210b95e41d06c2338a22ba6af248645;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
index d8a1490021..7490a03c5c 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
@@ -1,6 +1,7 @@
 ## @file
 #  EFI_REGULAR_EXPRESSION_PROTOCOL Implementation
 #
+#  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
 #
 #  This program and the accompanying materials are licensed and made available
@@ -28,6 +29,7 @@
   Oniguruma/OnigurumaIntrinsics.c | MSFT
 
 # Upstream Oniguruma code
+  Oniguruma/onig_init.c
   Oniguruma/oniguruma.h
   Oniguruma/regcomp.c
   Oniguruma/regenc.c
@@ -49,9 +51,13 @@
   Oniguruma/st.h
 
 # Supported Character Encodings
-  Oniguruma/enc/ascii.c
-  Oniguruma/enc/unicode.c
-  Oniguruma/enc/utf16_le.c
+  Oniguruma/ascii.c
+  Oniguruma/unicode.c
+  Oniguruma/unicode_fold1_key.c
+  Oniguruma/unicode_fold2_key.c
+  Oniguruma/unicode_fold3_key.c
+  Oniguruma/unicode_unfold_key.c
+  Oniguruma/utf16_le.c
 
 [Packages]
   MdePkg/MdePkg.dec
@@ -74,13 +80,8 @@
 
 [BuildOptions]
   # Override MSFT build option to remove /Oi and /GL
-  MSFT:DEBUG_*_IA32_CC_FLAGS   == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
-  MSFT:RELEASE_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF
-  MSFT:DEBUG_*_X64_CC_FLAGS    == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /X
-  MSFT:RELEASE_*_X64_CC_FLAGS  == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /X
-  MSFT:DEBUG_*_IPF_CC_FLAGS    == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /Zi /X
-  MSFT:RELEASE_*_IPF_CC_FLAGS  == /nologo /c /WX /GS- /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /X
-  INTEL:*_*_*_CC_FLAGS         =  /Oi-
+  MSFT:*_*_*_CC_FLAGS          = /GL-
+  INTEL:*_*_*_CC_FLAGS         = /Oi-
 
   # Oniguruma: potentially uninitialized local variable used
   MSFT:*_*_*_CC_FLAGS = /wd4701
@@ -94,3 +95,17 @@
   # Oniguruma: 'type cast' : truncation from 'OnigUChar *' to 'unsigned int'
   MSFT:*_*_*_CC_FLAGS = /wd4305 /wd4306
 
+  # Oniguruma: nameless union declared in regparse.h
+  MSFT:*_*_*_CC_FLAGS = /wd4201
+
+  # Oniguruma: 'type cast' : "int" to "OnigUChar", function pointer to "void *"
+  MSFT:*_*_*_CC_FLAGS = /wd4244 /wd4054
+
+  # Oniguruma: previous local declaration
+  MSFT:*_*_*_CC_FLAGS = /wd4456
+
+  # Oniguruma: signed and unsigned mismatch/cast
+  MSFT:*_*_*_CC_FLAGS = /wd4018 /wd4245 /wd4389
+
+  # Oniguruma: error: variable 'fp' set but not used
+  GCC:*_*_*_CC_FLAGS = -Wno-error=unused-but-set-variable