Add multiple symbols for each SymbolReq

Author: lawwong

Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs

@@ -48,6 +48,7 @@ public class ReqMethodInfo
             }
 
             public string symbol = string.Empty;
+            public string[] symbols = null;
             public string[] reqTypeNames = null;
             public string[] reqAnyTypeNames = null;
             public string[] reqFileNames = null;
@@ -442,26 +443,52 @@ private static void DoUpdateScriptingDefineSymbols()
 
             var defineSymbols = GetDefineSymbols();
             var defineSymbolsChanged = false;
+            var validSymbols = new HashSet<string>();
+            var invalidSymbols = new HashSet<string>();
 
             foreach (var symbolReq in s_symbolReqList)
             {
                 if (symbolReq.Validate())
                 {
-                    if (!defineSymbols.Contains(symbolReq.symbol))
+                    if (!string.IsNullOrEmpty(symbolReq.symbol)) { validSymbols.Add(symbolReq.symbol); }
+                    if (symbolReq.symbols != null)
                     {
-                        defineSymbols.Add(symbolReq.symbol);
-                        defineSymbolsChanged = true;
+                        foreach (var symbol in symbolReq.symbols)
+                        {
+                            if (!string.IsNullOrEmpty(symbol)) { validSymbols.Add(symbol); }
+                        }
                     }
                 }
                 else
                 {
-                    if (defineSymbols.RemoveAll((symbol) => symbol == symbolReq.symbol) > 0)
+                    if (!string.IsNullOrEmpty(symbolReq.symbol)) { invalidSymbols.Add(symbolReq.symbol); }
+                    if (symbolReq.symbols != null)
                     {
-                        defineSymbolsChanged = true;
+                        foreach (var symbol in symbolReq.symbols)
+                        {
+                            if (!string.IsNullOrEmpty(symbol)) { invalidSymbols.Add(symbol); }
+                        }
                     }
                 }
             }
 
+            foreach (var symbol in invalidSymbols)
+            {
+                if (defineSymbols.RemoveAll((s) => s == symbol) > 0)
+                {
+                    defineSymbolsChanged = true;
+                }
+            }
+
+            foreach (var symbol in validSymbols)
+            {
+                if (!defineSymbols.Contains(symbol))
+                {
+                    defineSymbols.Add(symbol);
+                    defineSymbolsChanged = true;
+                }
+            }
+
             if (defineSymbolsChanged)
             {
                 SetDefineSymbols(defineSymbols);