aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler
diff options
context:
space:
mode:
authorTedd Hansen2007-08-18 21:10:40 +0000
committerTedd Hansen2007-08-18 21:10:40 +0000
commitf444fe4f87dd88b9c400c2b4efe9a050332c4f54 (patch)
tree06fff56f78ddc1b9ee1a6026bfe3a19e97b28005 /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler
parentLSL Compiler now only referring required assemblies (DotNetEngine and Common)... (diff)
downloadopensim-SC-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.zip
opensim-SC-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.tar.gz
opensim-SC-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.tar.bz2
opensim-SC-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.tar.xz
Moved OpenSim.Region.ScriptEngine.Common.dll from bin\ScriptEngine\ to bin\ folder - hopefully solves compile problem on Linux.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index c29b9f4..435ee08 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -59,10 +59,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
59 //parameters.ReferencedAssemblies.Add(asm.Location); 59 //parameters.ReferencedAssemblies.Add(asm.Location);
60 } 60 }
61 61
62 string rootPath = Path.GetDirectoryName(this.GetType().Assembly.Location); 62 string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
63 string rootPathSE = Path.GetDirectoryName(this.GetType().Assembly.Location);
63 Console.WriteLine("Assembly location: " + rootPath); 64 Console.WriteLine("Assembly location: " + rootPath);
64 parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Common.dll")); 65 parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Common.dll"));
65 parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.DotNetEngine.dll")); 66 parameters.ReferencedAssemblies.Add(Path.Combine(rootPathSE, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));
66 67
67 //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment"); 68 //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");
68 parameters.GenerateExecutable = false; 69 parameters.GenerateExecutable = false;