diff options
author | lbsa71 | 2007-06-13 19:58:57 +0000 |
---|---|---|
committer | lbsa71 | 2007-06-13 19:58:57 +0000 |
commit | 69b3a8a9b84a0fb1918f728e27a92ab52128ae3c (patch) | |
tree | 4b34856cad308a93f23a8b593d1174b104c92b59 /OpenSim/OpenSim.Physics | |
parent | * Applying danx0r's ODE patch (diff) | |
download | opensim-SC_OLD-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.zip opensim-SC_OLD-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.tar.gz opensim-SC_OLD-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.tar.bz2 opensim-SC_OLD-69b3a8a9b84a0fb1918f728e27a92ab52128ae3c.tar.xz |
* First attempt at fixing differing build files on different .net flavours.
* And, as always, some bin ignores
Diffstat (limited to '')
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 5845387..00ca3f9 100644 --- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -19,9 +19,9 @@ | |||
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | 22 | <include name="../../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | 23 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> |
24 | <include name="System.dll" /> | ||
25 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" /> |
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 726444a..fc3e1e6 100644 --- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build | |||
@@ -22,11 +22,11 @@ | |||
22 | <include name="${project::get-base-directory()}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | </lib> | 24 | </lib> |
25 | <include name="System.dll" /> | ||
26 | <include name="System.Xml.dll" /> | ||
27 | <include name="../../../bin/Axiom.MathLib.dll" /> | 25 | <include name="../../../bin/Axiom.MathLib.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../../bin/OpenSim.Framework.dll" /> |
29 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="System.dll" /> | ||
29 | <include name="System.Xml.dll" /> | ||
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | 32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> |
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build index a49782f..c93c0c2 100644 --- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build +++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build | |||
@@ -19,10 +19,10 @@ | |||
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | 22 | <include name="../../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | ||
25 | <include name="../../../bin/Ode.NET.dll" /> | 23 | <include name="../../../bin/Ode.NET.dll" /> |
24 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" /> |
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 2ea5534..be7a847 100644 --- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build | |||
@@ -19,10 +19,10 @@ | |||
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | 22 | <include name="../../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> | 23 | <include name="../../../bin/OpenSim.Physics.Manager.dll" /> |
24 | <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" /> | ||
25 | <include name="System.dll" /> | ||
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/Physics/" /> |