diff options
author | lbsa71 | 2007-04-04 13:27:13 +0000 |
---|---|---|
committer | lbsa71 | 2007-04-04 13:27:13 +0000 |
commit | 85385c958add66a55d26b10d4bdeaf59a055090a (patch) | |
tree | 70239119f2e50b41441f3c6379c65a7419cda1b1 /OpenSim.RegionServer | |
parent | Started to clean up/ rewrite Primitive class , currently the new version is c... (diff) | |
download | opensim-SC-85385c958add66a55d26b10d4bdeaf59a055090a.zip opensim-SC-85385c958add66a55d26b10d4bdeaf59a055090a.tar.gz opensim-SC-85385c958add66a55d26b10d4bdeaf59a055090a.tar.bz2 opensim-SC-85385c958add66a55d26b10d4bdeaf59a055090a.tar.xz |
* Added Primitive2 to vs2005 solution
* Apparently, Prebuild thinks DEBUG should be in there.
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/OpenSim.RegionServer.csproj | 47 | ||||
-rw-r--r-- | OpenSim.RegionServer/OpenSim.RegionServer.dll.build | 154 |
2 files changed, 96 insertions, 105 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 0f47576..6c0f2da 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -1,4 +1,4 @@ | |||
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> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</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.RegionServer</AssemblyName> | 12 | <AssemblyName>OpenSim.RegionServer</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.RegionServer</RootNamespace> | 19 | <RootNamespace>OpenSim.RegionServer</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,28 +55,26 @@ | |||
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="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Data" /> | 65 | <Reference Include="System.Xml" > |
73 | <Reference Include="System.Xml"> | ||
74 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
75 | <Private>False</Private> | 67 | <Private>False</Private> |
76 | </Reference> | 68 | </Reference> |
77 | <Reference Include="libsecondlife.dll"> | 69 | <Reference Include="libsecondlife.dll" > |
78 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
79 | <Private>False</Private> | 71 | <Private>False</Private> |
80 | </Reference> | 72 | </Reference> |
81 | <Reference Include="Axiom.MathLib.dll"> | 73 | <Reference Include="Axiom.MathLib.dll" > |
82 | <HintPath>..\bin\Axiom.MathLib.dll</HintPath> | 74 | <HintPath>..\bin\Axiom.MathLib.dll</HintPath> |
83 | <Private>False</Private> | 75 | <Private>False</Private> |
84 | </Reference> | 76 | </Reference> |
85 | <Reference Include="Db4objects.Db4o.dll"> | 77 | <Reference Include="Db4objects.Db4o.dll" > |
86 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> |
87 | <Private>False</Private> | 79 | <Private>False</Private> |
88 | </Reference> | 80 | </Reference> |
@@ -92,31 +84,31 @@ | |||
92 | <Name>OpenSim.Framework</Name> | 84 | <Name>OpenSim.Framework</Name> |
93 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
94 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
95 | <Private>False</Private> | 87 | <Private>False</Private> |
96 | </ProjectReference> | 88 | </ProjectReference> |
97 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
98 | <Name>OpenSim.Framework.Console</Name> | 90 | <Name>OpenSim.Framework.Console</Name> |
99 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
100 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
101 | <Private>False</Private> | 93 | <Private>False</Private> |
102 | </ProjectReference> | 94 | </ProjectReference> |
103 | <ProjectReference Include="..\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> | 95 | <ProjectReference Include="..\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> |
104 | <Name>OpenSim.GenericConfig.Xml</Name> | 96 | <Name>OpenSim.GenericConfig.Xml</Name> |
105 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> | 97 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> |
106 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
107 | <Private>False</Private> | 99 | <Private>False</Private> |
108 | </ProjectReference> | 100 | </ProjectReference> |
109 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 101 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
110 | <Name>OpenSim.Physics.Manager</Name> | 102 | <Name>OpenSim.Physics.Manager</Name> |
111 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 103 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> |
112 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
113 | <Private>False</Private> | 105 | <Private>False</Private> |
114 | </ProjectReference> | 106 | </ProjectReference> |
115 | <ProjectReference Include="..\Servers\OpenSim.Servers.csproj"> | 107 | <ProjectReference Include="..\Servers\OpenSim.Servers.csproj"> |
116 | <Name>OpenSim.Servers</Name> | 108 | <Name>OpenSim.Servers</Name> |
117 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 109 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> |
118 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
119 | <Private>False</Private> | 111 | <Private>False</Private> |
120 | </ProjectReference> | 112 | </ProjectReference> |
121 | </ItemGroup> | 113 | </ItemGroup> |
122 | <ItemGroup> | 114 | <ItemGroup> |
@@ -180,7 +172,6 @@ | |||
180 | <Compile Include="world\Primitive.cs"> | 172 | <Compile Include="world\Primitive.cs"> |
181 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
182 | </Compile> | 174 | </Compile> |
183 | <Compile Include="world\Primitive2.cs" /> | ||
184 | <Compile Include="world\ScriptEngine.cs"> | 175 | <Compile Include="world\ScriptEngine.cs"> |
185 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
186 | </Compile> | 177 | </Compile> |
@@ -219,4 +210,4 @@ | |||
219 | <PostBuildEvent> | 210 | <PostBuildEvent> |
220 | </PostBuildEvent> | 211 | </PostBuildEvent> |
221 | </PropertyGroup> | 212 | </PropertyGroup> |
222 | </Project> \ No newline at end of file | 213 | </Project> |
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 9a1a8eb..4a08551 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -1,77 +1,77 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.RegionServer" default="build"> | 2 | <project name="OpenSim.RegionServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentAssetUpload.cs" /> | 14 | <include name="AgentAssetUpload.cs" /> |
15 | <include name="ConsoleCmds.cs" /> | 15 | <include name="ConsoleCmds.cs" /> |
16 | <include name="Grid.cs" /> | 16 | <include name="Grid.cs" /> |
17 | <include name="OpenSimMain.cs" /> | 17 | <include name="OpenSimMain.cs" /> |
18 | <include name="OpenSimNetworkHandler.cs" /> | 18 | <include name="OpenSimNetworkHandler.cs" /> |
19 | <include name="PacketServer.cs" /> | 19 | <include name="PacketServer.cs" /> |
20 | <include name="QueItem.cs" /> | 20 | <include name="QueItem.cs" /> |
21 | <include name="RegionInfo.cs" /> | 21 | <include name="RegionInfo.cs" /> |
22 | <include name="SimClient.cs" /> | 22 | <include name="SimClient.cs" /> |
23 | <include name="SimConsole.cs" /> | 23 | <include name="SimConsole.cs" /> |
24 | <include name="VersionInfo.cs" /> | 24 | <include name="VersionInfo.cs" /> |
25 | <include name="Assets/AssetCache.cs" /> | 25 | <include name="Assets/AssetCache.cs" /> |
26 | <include name="Assets/InventoryCache.cs" /> | 26 | <include name="Assets/InventoryCache.cs" /> |
27 | <include name="CAPS/AdminWebFront.cs" /> | 27 | <include name="CAPS/AdminWebFront.cs" /> |
28 | <include name="types/Mesh.cs" /> | 28 | <include name="types/Mesh.cs" /> |
29 | <include name="types/Triangle.cs" /> | 29 | <include name="types/Triangle.cs" /> |
30 | <include name="world/Avatar.cs" /> | 30 | <include name="world/Avatar.cs" /> |
31 | <include name="world/AvatarAnimations.cs" /> | 31 | <include name="world/AvatarAnimations.cs" /> |
32 | <include name="world/Entity.cs" /> | 32 | <include name="world/Entity.cs" /> |
33 | <include name="world/Primitive.cs" /> | 33 | <include name="world/Primitive.cs" /> |
34 | <include name="world/ScriptEngine.cs" /> | 34 | <include name="world/ScriptEngine.cs" /> |
35 | <include name="world/SurfacePatch.cs" /> | 35 | <include name="world/SurfacePatch.cs" /> |
36 | <include name="world/World.cs" /> | 36 | <include name="world/World.cs" /> |
37 | <include name="world/scripting/IScript.cs" /> | 37 | <include name="world/scripting/IScript.cs" /> |
38 | <include name="world/scripting/IScriptContext.cs" /> | 38 | <include name="world/scripting/IScriptContext.cs" /> |
39 | <include name="world/scripting/IScriptEntity.cs" /> | 39 | <include name="world/scripting/IScriptEntity.cs" /> |
40 | <include name="world/scripting/IScriptHandler.cs" /> | 40 | <include name="world/scripting/IScriptHandler.cs" /> |
41 | <include name="world/scripting/Script.cs" /> | 41 | <include name="world/scripting/Script.cs" /> |
42 | <include name="world/scripting/ScriptFactory.cs" /> | 42 | <include name="world/scripting/ScriptFactory.cs" /> |
43 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> | 43 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> |
44 | </sources> | 44 | </sources> |
45 | <references basedir="${project::get-base-directory()}"> | 45 | <references basedir="${project::get-base-directory()}"> |
46 | <lib> | 46 | <lib> |
47 | <include name="${project::get-base-directory()}" /> | 47 | <include name="${project::get-base-directory()}" /> |
48 | <include name="${project::get-base-directory()}/${build.dir}" /> | 48 | <include name="${project::get-base-directory()}/${build.dir}" /> |
49 | </lib> | 49 | </lib> |
50 | <include name="System.dll" /> | 50 | <include name="System.dll" /> |
51 | <include name="System.Xml.dll" /> | 51 | <include name="System.Xml.dll" /> |
52 | <include name="../bin/libsecondlife.dll" /> | 52 | <include name="../bin/libsecondlife.dll" /> |
53 | <include name="../bin/Axiom.MathLib.dll" /> | 53 | <include name="../bin/Axiom.MathLib.dll" /> |
54 | <include name="../bin/Db4objects.Db4o.dll" /> | 54 | <include name="../bin/Db4objects.Db4o.dll" /> |
55 | <include name="../bin/OpenSim.Framework.dll" /> | 55 | <include name="../bin/OpenSim.Framework.dll" /> |
56 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 56 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
57 | <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> | 57 | <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> |
58 | <include name="../bin/OpenSim.Physics.Manager.dll" /> | 58 | <include name="../bin/OpenSim.Physics.Manager.dll" /> |
59 | <include name="../bin/OpenSim.Servers.dll" /> | 59 | <include name="../bin/OpenSim.Servers.dll" /> |
60 | </references> | 60 | </references> |
61 | </csc> | 61 | </csc> |
62 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 62 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
63 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 63 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
64 | <copy todir="${project::get-base-directory()}/../bin/"> | 64 | <copy todir="${project::get-base-directory()}/../bin/"> |
65 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 65 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
66 | <include name="*.dll"/> | 66 | <include name="*.dll"/> |
67 | <include name="*.exe"/> | 67 | <include name="*.exe"/> |
68 | </fileset> | 68 | </fileset> |
69 | </copy> | 69 | </copy> |
70 | </target> | 70 | </target> |
71 | <target name="clean"> | 71 | <target name="clean"> |
72 | <delete dir="${bin.dir}" failonerror="false" /> | 72 | <delete dir="${bin.dir}" failonerror="false" /> |
73 | <delete dir="${obj.dir}" failonerror="false" /> | 73 | <delete dir="${obj.dir}" failonerror="false" /> |
74 | </target> | 74 | </target> |
75 | <target name="doc" description="Creates documentation."> | 75 | <target name="doc" description="Creates documentation."> |
76 | </target> | 76 | </target> |
77 | </project> | 77 | </project> |