diff options
Diffstat (limited to 'OpenSim.Physics')
4 files changed, 38 insertions, 47 deletions
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index dbfebd3..5fa02ed 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{00594B9E-29A5-4B9C-AEBD-0AD08C73CFE8}</ProjectGuid> | 6 | <ProjectGuid>{BD7FF9CA-48DA-4DC3-9ADA-3A9AB10A27F2}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -59,17 +59,20 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>\System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | ||
63 | </Reference> | 64 | </Reference> |
64 | <Reference Include="Axiom.MathLib.dll" > | 65 | <Reference Include="Axiom.MathLib.dll" > |
65 | <HintPath>\Axiom.MathLib.dll.dll</HintPath> | 66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
67 | <Private>False</Private> | ||
66 | </Reference> | 68 | </Reference> |
67 | </ItemGroup> | 69 | </ItemGroup> |
68 | <ItemGroup> | 70 | <ItemGroup> |
69 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 71 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> |
70 | <Name>OpenSim.Physics.Manager</Name> | 72 | <Name>OpenSim.Physics.Manager</Name> |
71 | <Project>{58360A80-9333-4E0F-8F83-3CF937E51633}</Project> | 73 | <Project>{FA317002-FFCB-4066-B107-FCCD5E313DE9}</Project> |
72 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
75 | <Private>False</Private> | ||
73 | </ProjectReference> | 76 | </ProjectReference> |
74 | </ItemGroup> | 77 | </ItemGroup> |
75 | <ItemGroup> | 78 | <ItemGroup> |
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user deleted file mode 100644 index 13e65a8..0000000 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ReferencePath>C:\Documents and Settings\Stefan\My Documents\Projects\source\opensim\branches\zircon\bin\</ReferencePath> | ||
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | ||
7 | <ProjectView>ProjectFiles</ProjectView> | ||
8 | <ProjectTrust>0</ProjectTrust> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> | ||
11 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> | ||
12 | </Project> | ||
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index 728686e..d13b9f0 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{58360A80-9333-4E0F-8F83-3CF937E51633}</ProjectGuid> | 6 | <ProjectGuid>{FA317002-FFCB-4066-B107-FCCD5E313DE9}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
@@ -59,20 +59,24 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>\System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | ||
63 | </Reference> | 64 | </Reference> |
64 | <Reference Include="System.Xml.dll" > | 65 | <Reference Include="System.Xml" > |
65 | <HintPath>\System.Xml.dll.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | ||
66 | </Reference> | 68 | </Reference> |
67 | <Reference Include="Axiom.MathLib.dll" > | 69 | <Reference Include="Axiom.MathLib.dll" > |
68 | <HintPath>\Axiom.MathLib.dll.dll</HintPath> | 70 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
71 | <Private>False</Private> | ||
69 | </Reference> | 72 | </Reference> |
70 | </ItemGroup> | 73 | </ItemGroup> |
71 | <ItemGroup> | 74 | <ItemGroup> |
72 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 75 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
73 | <Name>OpenSim.Framework.Console</Name> | 76 | <Name>OpenSim.Framework.Console</Name> |
74 | <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project> | 77 | <Project>{FCDE59EA-602A-4705-BBC1-A228522669E4}</Project> |
75 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | ||
76 | </ProjectReference> | 80 | </ProjectReference> |
77 | </ItemGroup> | 81 | </ItemGroup> |
78 | <ItemGroup> | 82 | <ItemGroup> |
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index db310e9..1cdd46f 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | |||
@@ -1,13 +1,12 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{CBE1E31D-D7E3-4791-A616-F00173BBC26A}</ProjectGuid> | 6 | <ProjectGuid>{40308959-8EF3-4818-8CE6-47C158CFBD34}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName> | 12 | <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace> | 19 | <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,26 +55,28 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="PhysX_Wrapper_Dotnet, Version=1.0.2628.28883, Culture=neutral, processorArchitecture=MSIL"> | 61 | <Reference Include="System" > |
69 | <SpecificVersion>False</SpecificVersion> | 62 | <HintPath>System.dll</HintPath> |
70 | <HintPath>..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System"> | 65 | <Reference Include="Axiom.MathLib.dll" > |
73 | <HintPath>\System.dll</HintPath> | 66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
67 | <Private>False</Private> | ||
74 | </Reference> | 68 | </Reference> |
75 | <Reference Include="Axiom.MathLib.dll"> | 69 | <Reference Include="PhysX_Wrapper_Dotnet.dll" > |
76 | <HintPath>\Axiom.MathLib.dll.dll</HintPath> | 70 | <HintPath>..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> |
71 | <Private>False</Private> | ||
77 | </Reference> | 72 | </Reference> |
78 | </ItemGroup> | 73 | </ItemGroup> |
79 | <ItemGroup> | 74 | <ItemGroup> |
80 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 75 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> |
81 | <Name>OpenSim.Physics.Manager</Name> | 76 | <Name>OpenSim.Physics.Manager</Name> |
82 | <Project>{58360A80-9333-4E0F-8F83-3CF937E51633}</Project> | 77 | <Project>{FA317002-FFCB-4066-B107-FCCD5E313DE9}</Project> |
83 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | ||
84 | </ProjectReference> | 80 | </ProjectReference> |
85 | </ItemGroup> | 81 | </ItemGroup> |
86 | <ItemGroup> | 82 | <ItemGroup> |
@@ -98,4 +94,4 @@ | |||
98 | <PostBuildEvent> | 94 | <PostBuildEvent> |
99 | </PostBuildEvent> | 95 | </PostBuildEvent> |
100 | </PropertyGroup> | 96 | </PropertyGroup> |
101 | </Project> \ No newline at end of file | 97 | </Project> |