aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2012-02-08 15:29:48 +0000
committerUbitUmarov2012-02-08 15:29:48 +0000
commit12c32396665d5cf72235b074a91b25a5d1770b53 (patch)
treecbd308ccf76e1a6a883064ad0e3e07429445e12a
parent changes in physics manager, needed for UbitODE (diff)
downloadopensim-SC_OLD-12c32396665d5cf72235b074a91b25a5d1770b53.zip
opensim-SC_OLD-12c32396665d5cf72235b074a91b25a5d1770b53.tar.gz
opensim-SC_OLD-12c32396665d5cf72235b074a91b25a5d1770b53.tar.bz2
opensim-SC_OLD-12c32396665d5cf72235b074a91b25a5d1770b53.tar.xz
changes needed to compile UbitODE, also changes project name to "Careminter". untested on linux
-rw-r--r--prebuild.xml35
-rwxr-xr-xrunprebuild.bat2
-rwxr-xr-xrunprebuild2010.bat2
3 files changed, 35 insertions, 4 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 7f069bd..e666311 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1,12 +1,12 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<Prebuild version="1.7" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"> 2<Prebuild version="1.7" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
3 <Solution activeConfig="Debug" name="OpenSim" path="./" version="0.5.0-$Rev$"> 3 <Solution activeConfig="Debug" name="Careminster" path="./" version="0.5.0-$Rev$">
4 <Configuration name="Debug"> 4 <Configuration name="Debug">
5 <Options> 5 <Options>
6 <CompilerDefines>TRACE;DEBUG</CompilerDefines> 6 <CompilerDefines>TRACE;DEBUG</CompilerDefines>
7 <OptimizeCode>false</OptimizeCode> 7 <OptimizeCode>false</OptimizeCode>
8 <CheckUnderflowOverflow>false</CheckUnderflowOverflow> 8 <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
9 <AllowUnsafe>false</AllowUnsafe> 9 <AllowUnsafe>true</AllowUnsafe>
10 <WarningLevel>4</WarningLevel> 10 <WarningLevel>4</WarningLevel>
11 <WarningsAsErrors>false</WarningsAsErrors> 11 <WarningsAsErrors>false</WarningsAsErrors>
12 <SuppressWarnings/> 12 <SuppressWarnings/>
@@ -606,6 +606,36 @@
606 </Files> 606 </Files>
607 </Project> 607 </Project>
608 608
609 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.UbitOdePlugin" path="OpenSim/Region/Physics/UbitOdePlugin" type="Library">
610 <Configuration name="Debug">
611 <Options>
612 <OutputPath>../../../../bin/Physics/</OutputPath>
613 </Options>
614 </Configuration>
615 <Configuration name="Release">
616 <Options>
617 <OutputPath>../../../../bin/Physics/</OutputPath>
618 </Options>
619 </Configuration>
620
621 <ReferencePath>../../../../bin/</ReferencePath>
622 <Reference name="System"/>
623 <Reference name="System.Core"/>
624 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
625 <Reference name="Nini" path="../../../../bin/"/>
626
627 <Reference name="OpenSim.Framework"/>
628 <Reference name="OpenSim.Framework.Console"/>
629 <Reference name="OpenSim.Region.Physics.Manager"/>
630 <Reference name="log4net" path="../../../../bin/"/>
631
632 <Files>
633 <Match pattern="*.cs" recurse="true">
634 <Exclude name="Tests" pattern="Tests"/>
635 </Match>
636 </Files>
637 </Project>
638
609 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library"> 639 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
610 <Configuration name="Debug"> 640 <Configuration name="Debug">
611 <Options> 641 <Options>
@@ -3321,6 +3351,7 @@
3321 <Reference name="OpenSim.Region.CoreModules"/> 3351 <Reference name="OpenSim.Region.CoreModules"/>
3322 <Reference name="OpenSim.Region.Framework"/> 3352 <Reference name="OpenSim.Region.Framework"/>
3323 <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> 3353 <Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
3354 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
3324 <Reference name="OpenSim.Tests.Common"/> 3355 <Reference name="OpenSim.Tests.Common"/>
3325 <Files> 3356 <Files>
3326 <Match pattern="*.cs" recurse="false"/> 3357 <Match pattern="*.cs" recurse="false"/>
diff --git a/runprebuild.bat b/runprebuild.bat
index 8927e9a..cfa5199 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -1,4 +1,4 @@
1bin\Prebuild.exe /target nant 1bin\Prebuild.exe /target nant
2bin\Prebuild.exe /target vs2008 2bin\Prebuild.exe /target vs2008
3echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat 3echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild Careminster.sln > compile.bat
4 4
diff --git a/runprebuild2010.bat b/runprebuild2010.bat
index 8c832b3..1e1caaa 100755
--- a/runprebuild2010.bat
+++ b/runprebuild2010.bat
@@ -1,2 +1,2 @@
1bin\Prebuild.exe /target vs2010 1bin\Prebuild.exe /target vs2010
2echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat 2echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild Careminster.sln > compile.bat