From 616f3844b67fbd840753bb8fcf8c8dda04a36cba Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 11 Jul 2011 15:24:23 -0700
Subject: Moved ConvexDecompositionDotNet.dll to bin directory to fix picky
references on Linux
---
prebuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/prebuild.xml b/prebuild.xml
index 63590c8..66ecfd9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -637,12 +637,12 @@
<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
<Configuration name="Debug">
<Options>
- <OutputPath>../../../../bin/Physics/</OutputPath>
+ <OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
- <OutputPath>../../../../bin/Physics/</OutputPath>
+ <OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
--
cgit v1.1
From 38f0cf4bf41c8d7a5721dee9bd756f7bfa322d1f Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Mon, 11 Jul 2011 15:24:23 -0700
Subject: Moved ConvexDecompositionDotNet.dll to bin directory to fix picky
references on Linux
---
prebuild.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/prebuild.xml b/prebuild.xml
index 63590c8..66ecfd9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -637,12 +637,12 @@
<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
<Configuration name="Debug">
<Options>
- <OutputPath>../../../../bin/Physics/</OutputPath>
+ <OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
- <OutputPath>../../../../bin/Physics/</OutputPath>
+ <OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
--
cgit v1.1
From 1f3e42adf37c3ae9523202cc22b3c23609dfc283 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Tue, 12 Jul 2011 11:14:48 -0700
Subject: reorder bulletsim and convex decomposition projects in prebuild.xml.
seems to fix the build on mono/linux.
---
prebuild.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/prebuild.xml b/prebuild.xml
index 66ecfd9..356c4b0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -601,31 +601,23 @@
</Files>
</Project>
- <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
+ <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
<Configuration name="Debug">
<Options>
- <OutputPath>../../../../bin/Physics/</OutputPath>
+ <OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
- <OutputPath>../../../../bin/Physics/</OutputPath>
+ <OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Core"/>
+ <Reference name="System.Data"/>
<Reference name="System.Xml"/>
- <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
- <Reference name="Nini.dll" path="../../../../bin/"/>
- <Reference name="OpenSim.Framework"/>
- <Reference name="OpenSim.Region.Framework"/>
- <Reference name="OpenSim.Region.CoreModules"/>
- <Reference name="OpenSim.Framework.Console"/>
- <Reference name="OpenSim.Region.Physics.Manager"/>
- <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
- <Reference name="log4net.dll" path="../../../../bin/"/>
<Files>
<Match pattern="*.cs" recurse="true">
@@ -634,23 +626,31 @@
</Files>
</Project>
- <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
+ <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
<Configuration name="Debug">
<Options>
- <OutputPath>../../../../bin/</OutputPath>
+ <OutputPath>../../../../bin/Physics/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
- <OutputPath>../../../../bin/</OutputPath>
+ <OutputPath>../../../../bin/Physics/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Core"/>
- <Reference name="System.Data"/>
<Reference name="System.Xml"/>
+ <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
+ <Reference name="Nini.dll" path="../../../../bin/"/>
+ <Reference name="OpenSim.Framework"/>
+ <Reference name="OpenSim.Region.Framework"/>
+ <Reference name="OpenSim.Region.CoreModules"/>
+ <Reference name="OpenSim.Framework.Console"/>
+ <Reference name="OpenSim.Region.Physics.Manager"/>
+ <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
+ <Reference name="log4net.dll" path="../../../../bin/"/>
<Files>
<Match pattern="*.cs" recurse="true">
--
cgit v1.1