fix: Prevent Compiler Paradox (#1145)

* Prevent Compiler Paradox * Change platform to Editor Only * added new line at EOF
MirageNet · Oct 14, 2019 · fd43c67 · fd43c67
1 parent ae2f5cb
commit fd43c67
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 28 deletions.
diff --git a/Assets/Mirror/CompilerSymbols.meta b/Assets/Mirror/CompilerSymbols.meta
diff --git a/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef b/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef
@@ -0,0 +1,14 @@
+{
+    "name": "Mirror.CompilerSymbols",
+    "references": [],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}
diff --git a/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef.meta b/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef.meta
diff --git a/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs b/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace Mirror
+{
+    static class PreprocessorDefine
+    {
+        /// <summary>
+        /// Add define symbols as soon as Unity gets done compiling.
+        /// </summary>
+        [InitializeOnLoadMethod]
+        static void AddDefineSymbols()
+        {
+            HashSet<string> defines = new HashSet<string>(PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup).Split(';'))
+            {
+                "MIRROR",
+                "MIRROR_1726_OR_NEWER",
+                "MIRROR_3_0_OR_NEWER",
+                "MIRROR_3_12_OR_NEWER",
+                "MIRROR_4_0_OR_NEWER"
+            };
+            PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, string.Join(";", defines));
+        }
+    }
+}
diff --git a/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs.meta b/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs.meta
diff --git a/Assets/Mirror/Editor/PreprocessorDefine.cs b/Assets/Mirror/Editor/PreprocessorDefine.cs
@@ -1,25 +1,4 @@
-using System.Collections.Generic;
-using UnityEditor;
-
-namespace Mirror
-{
-    static class PreprocessorDefine
-    {
-        /// <summary>
-        /// Add define symbols as soon as Unity gets done compiling.
-        /// </summary>
-        [InitializeOnLoadMethod]
-        static void AddDefineSymbols()
-        {
-            HashSet<string> defines = new HashSet<string>(PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup).Split(';'))
-            {
-                "MIRROR",
-                "MIRROR_1726_OR_NEWER",
-                "MIRROR_3_0_OR_NEWER",
-                "MIRROR_3_12_OR_NEWER",
-                "MIRROR_4_0_OR_NEWER"
-            };
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, string.Join(";", defines));
-        }
-    }
-}
+// This file was moved to Mirror/CompilerSymbols in Mirror 4.0
+// The purpose of this file is to get the old file overwritten
+// when users update from the asset store to prevent a flood of errors
+// from having the old file still in the project as a straggler.
diff --git a/Assets/Mirror/Editor/PreprocessorDefine.cs.meta b/Assets/Mirror/Editor/PreprocessorDefine.cs.meta
diff --git a/Assets/Mirror/Runtime/Mirror.asmdef b/Assets/Mirror/Runtime/Mirror.asmdef
@@ -1,8 +1,14 @@
 {
     "name": "Mirror",
-    "references": [],
+    "references": [
+        "Mirror.CompilerSymbols"
+    ],
     "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
-    "allowUnsafeCode": false
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
 }