MdeModulePkg/RegularExpressionDxe: Make oniguruma a submodule in edk2.

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / RegularExpressionDxe.inf

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
index dd33205fcebe276fe8a4b1b6098e602a965d5485..da63aa6eb4181173d00aa48782e69fcb0f8fa58e 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  EFI_REGULAR_EXPRESSION_PROTOCOL Implementation\r
 #\r
-#  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2018-2020, Intel Corporation. All rights reserved.<BR>\r
 #  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -18,40 +18,55 @@
 [Sources]\r
   RegularExpressionDxe.c\r
   RegularExpressionDxe.h\r
-  Oniguruma/OnigurumaUefiPort.h\r
-  Oniguruma/OnigurumaUefiPort.c\r
-  Oniguruma/OnigurumaIntrinsics.c | MSFT\r
+  OnigurumaUefiPort.h\r
+  OnigurumaUefiPort.c\r
+  OnigurumaIntrinsics.c | MSFT\r
+\r
+# Wrapper header files start #\r
+  stdio.h\r
+  stdarg.h\r
+  stddef.h\r
+  stdlib.h\r
+  string.h\r
+  config.h\r
+# Wrapper header files end #\r
 \r
 # Upstream Oniguruma code\r
-  Oniguruma/onig_init.c\r
-  Oniguruma/oniguruma.h\r
-  Oniguruma/regcomp.c\r
-  Oniguruma/regenc.c\r
-  Oniguruma/regenc.h\r
-  Oniguruma/regerror.c\r
-  Oniguruma/regexec.c\r
-  Oniguruma/oniggnu.h\r
-  Oniguruma/reggnu.c\r
-  Oniguruma/regint.h\r
-  Oniguruma/regparse.c\r
-  Oniguruma/regparse.h\r
-  Oniguruma/regposerr.c\r
-  Oniguruma/onigposix.h\r
-  Oniguruma/regposix.c\r
-  Oniguruma/regsyntax.c\r
-  Oniguruma/regtrav.c\r
-  Oniguruma/regversion.c\r
-  Oniguruma/st.c\r
-  Oniguruma/st.h\r
+  oniguruma/src/onig_init.c\r
+  oniguruma/src/oniguruma.h\r
+  oniguruma/src/regcomp.c\r
+  oniguruma/src/regenc.c\r
+  oniguruma/src/regenc.h\r
+  oniguruma/src/regerror.c\r
+  oniguruma/src/regexec.c\r
+  oniguruma/src/oniggnu.h\r
+  oniguruma/src/reggnu.c\r
+  oniguruma/src/regint.h\r
+  oniguruma/src/regparse.c\r
+  oniguruma/src/regparse.h\r
+  oniguruma/src/regposerr.c\r
+  oniguruma/src/onigposix.h\r
+  oniguruma/src/regposix.c\r
+  oniguruma/src/regsyntax.c\r
+  oniguruma/src/regtrav.c\r
+  oniguruma/src/regversion.c\r
+  oniguruma/src/st.c\r
+  oniguruma/src/st.h\r
 \r
 # Supported Character Encodings\r
-  Oniguruma/ascii.c\r
-  Oniguruma/unicode.c\r
-  Oniguruma/unicode_fold1_key.c\r
-  Oniguruma/unicode_fold2_key.c\r
-  Oniguruma/unicode_fold3_key.c\r
-  Oniguruma/unicode_unfold_key.c\r
-  Oniguruma/utf16_le.c\r
+  oniguruma/src/ascii.c\r
+  oniguruma/src/unicode.c\r
+  oniguruma/src/unicode_fold1_key.c\r
+  oniguruma/src/unicode_fold2_key.c\r
+  oniguruma/src/unicode_fold3_key.c\r
+  oniguruma/src/unicode_unfold_key.c\r
+  oniguruma/src/utf16_le.c\r
+  oniguruma/src/utf8.c\r
+  oniguruma/src/utf16_be.c\r
+  oniguruma/src/euc_jp.c\r
+  oniguruma/src/sjis.c\r
+  oniguruma/src/sjis_prop.c\r
+  oniguruma/src/euc_jp_prop.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -74,7 +89,7 @@
 \r
 [BuildOptions]\r
   # Enable STDARG for variable arguments\r
-  *_*_*_CC_FLAGS = -DHAVE_STDARG_H\r
+  *_*_*_CC_FLAGS = -DHAVE_STDARG_H -U_WIN32 -DONIG_VARIADIC_FUNC_ATTR=EFIAPI\r
 \r
   # Override MSFT build option to remove /Oi and /GL\r
   MSFT:*_*_*_CC_FLAGS          = /GL-\r
@@ -102,7 +117,7 @@
   MSFT:*_*_*_CC_FLAGS = /wd4456\r
 \r
   # Oniguruma: signed and unsigned mismatch/cast\r
-  MSFT:*_*_*_CC_FLAGS = /wd4018 /wd4245 /wd4389\r
+  MSFT:*_*_*_CC_FLAGS = /wd4018 /wd4245 /wd4389 /wd4090\r
 \r
   # Oniguruma: tag_end in parse_callout_of_name\r
   GCC:*_*_*_CC_FLAGS = -Wno-error=maybe-uninitialized\r