Last active
August 29, 2015 14:14
-
-
Save selfsame/947007ff7fba0bf1289c to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Editor/ClojureConfiguration.cs b/Editor/ClojureConfiguration.cs | |
index 5a2ec17..2082862 100644 | |
--- a/Editor/ClojureConfiguration.cs | |
+++ b/Editor/ClojureConfiguration.cs | |
@@ -1,3 +1,4 @@ | |
+using System.IO; | |
using System.Linq; | |
using UnityEngine; | |
using UnityEditor; | |
@@ -5,7 +6,7 @@ using clojure.lang; | |
[CustomEditor(typeof(ClojureConfigurationObject))] | |
public class ClojureConfiguration : Editor { | |
- public static string configFilePath = "Assets/Arcadia/configure.edn"; | |
+ public static string configFilePath = "Assets" + Path.DirectorySeparatorChar + "Arcadia" + Path.DirectorySeparatorChar + "configure.edn"; | |
static ClojureConfigurationObject _clojureConfigurationObject; | |
[MenuItem ("Arcadia/Configuration...")] | |
diff --git a/Editor/Initialization.cs b/Editor/Initialization.cs | |
index 936d67f..8818a32 100644 | |
--- a/Editor/Initialization.cs | |
+++ b/Editor/Initialization.cs | |
@@ -41,12 +41,12 @@ namespace Arcadia { | |
Debug.Log("Setting Load Path..."); | |
string clojureDllFolder = Path.GetDirectoryName( | |
AssetDatabase.GetAllAssetPaths() | |
- .Where(s => System.Text.RegularExpressions.Regex.IsMatch(s, ".*/Clojure.dll$")) // for compatibility with 4.3 | |
+ .Where(s => System.Text.RegularExpressions.Regex.IsMatch(s, ".*" + Path.DirectorySeparatorChar + "Clojure.dll$")) // for compatibility with 4.3 | |
.Single()); | |
Environment.SetEnvironmentVariable("CLOJURE_LOAD_PATH", | |
- Path.GetFullPath(VariadicCombine(clojureDllFolder, "..", "Compiled")) + ":" + | |
- Path.GetFullPath(VariadicCombine(clojureDllFolder, "..", "Source")) + ":" + | |
+ Path.GetFullPath(VariadicCombine(clojureDllFolder, "..", "Compiled")) + Path.PathSeparator + | |
+ Path.GetFullPath(VariadicCombine(clojureDllFolder, "..", "Source")) + Path.PathSeparator + | |
Path.GetFullPath(Application.dataPath)); | |
Debug.Log("Load Path is " + Environment.GetEnvironmentVariable("CLOJURE_LOAD_PATH")); | |
} catch(InvalidOperationException e) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment