fix define versions in compiler

HarpyWar · May 6, 2018 · 583dfab · 583dfab
1 parent 8fba1e9
commit 583dfab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ MurmurVersionCompiler/bin/
 MurmurVersionCompiler/obj/
 MurmurVersionCompiler/slice2cs/
 MurmurTest/
+.localhistory/
 *.suo
 *.user
 *.prr

diff --git a/MurmurVersionCompiler/Program.cs b/MurmurVersionCompiler/Program.cs
@@ -35,7 +35,12 @@ static void Main(string[] args)
                 var v = Path.GetFileName(f).Replace("Murmur_", "").Replace(".cs", "");
                 versions.Add(v);
             }
-
+
+            // cerrect sort
+            versions.Sort((x, y) => {
+                return x.CompareTo(y);
+            });
+
             foreach (var v in versions)
             {
                 contentDic.Clear();
@@ -71,17 +76,20 @@ static void Main(string[] args)
         static void Build(string version)
         {
             string shortVersion = version.Replace(".", "");
+            string _shortVersion;
 
-            // add all versions on defines
+            // add current version, including all previous, to defines
             string defines = "";
             foreach (var v in versions)
             {
-                defines += string.Format("MURMUR_{0};", shortVersion);
+                _shortVersion = v.Replace(".", "");
+                defines += string.Format("MURMUR_{0};", _shortVersion);
 
                 // stop adding constants
                 if (v == version)
                     break;
             }
+
             // Instantiate a new Engine object
             var engine = new Engine();