diff options
author | Adam Frisby | 2007-06-28 08:40:31 +0000 |
---|---|---|
committer | Adam Frisby | 2007-06-28 08:40:31 +0000 |
commit | 1ff47941919dc73b668d8eef07c8c9dd24d60969 (patch) | |
tree | e13457588efab35a0e41b35e41701631c393c00b /OpenSim/OpenSim.Terrain.BasicTerrain | |
parent | Shiny commit (finally) (diff) | |
download | opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.zip opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.gz opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.bz2 opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.xz |
* Run prebuild, and stuff. (Fixed bug)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj | 46 | ||||
-rw-r--r-- | OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build | 2 |
2 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj index 419880e..0469efe 100644 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj +++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.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>{2270B8FE-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{2270B8FE-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.Terrain.BasicTerrain</AssemblyName> | 12 | <AssemblyName>OpenSim.Terrain.BasicTerrain</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.Terrain.BasicTerrain</RootNamespace> | 19 | <RootNamespace>OpenSim.Terrain.BasicTerrain</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,32 +55,34 @@ | |||
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="libTerrain-BSD.dll"> | 61 | <Reference Include="libTerrain-BSD.dll" > |
69 | <HintPath>..\..\bin\libTerrain-BSD.dll</HintPath> | 62 | <HintPath>..\..\bin\libTerrain-BSD.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="Microsoft.JScript" /> | 65 | <Reference Include="Microsoft.JScript" > |
73 | <Reference Include="openjpegnet.dll"> | 66 | <HintPath>Microsoft.JScript.dll</HintPath> |
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="openjpegnet.dll" > | ||
74 | <HintPath>..\..\bin\openjpegnet.dll</HintPath> | 70 | <HintPath>..\..\bin\openjpegnet.dll</HintPath> |
75 | <Private>False</Private> | 71 | <Private>False</Private> |
76 | </Reference> | 72 | </Reference> |
77 | <Reference Include="System"> | 73 | <Reference Include="System" > |
78 | <HintPath>System.dll</HintPath> | 74 | <HintPath>System.dll</HintPath> |
79 | <Private>False</Private> | 75 | <Private>False</Private> |
80 | </Reference> | 76 | </Reference> |
81 | <Reference Include="System.Data"> | 77 | <Reference Include="System.Data" > |
82 | <HintPath>System.Data.dll</HintPath> | 78 | <HintPath>System.Data.dll</HintPath> |
83 | <Private>False</Private> | 79 | <Private>False</Private> |
84 | </Reference> | 80 | </Reference> |
85 | <Reference Include="System.Drawing"> | 81 | <Reference Include="System.Drawing" > |
86 | <HintPath>System.Drawing.dll</HintPath> | 82 | <HintPath>System.Drawing.dll</HintPath> |
87 | <Private>False</Private> | 83 | <Private>False</Private> |
88 | </Reference> | 84 | </Reference> |
89 | <Reference Include="System.Xml"> | 85 | <Reference Include="System.Xml" > |
90 | <HintPath>System.Xml.dll</HintPath> | 86 | <HintPath>System.Xml.dll</HintPath> |
91 | <Private>False</Private> | 87 | <Private>False</Private> |
92 | </Reference> | 88 | </Reference> |
@@ -97,10 +93,12 @@ | |||
97 | <Compile Include="TerrainEngine.cs"> | 93 | <Compile Include="TerrainEngine.cs"> |
98 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
99 | </Compile> | 95 | </Compile> |
96 | <Compile Include="TerrainFilter.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
100 | <Compile Include="Properties\AssemblyInfo.cs"> | 99 | <Compile Include="Properties\AssemblyInfo.cs"> |
101 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
102 | </Compile> | 101 | </Compile> |
103 | <Compile Include="TerrainFilter.cs" /> | ||
104 | </ItemGroup> | 102 | </ItemGroup> |
105 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
106 | <PropertyGroup> | 104 | <PropertyGroup> |
@@ -109,4 +107,4 @@ | |||
109 | <PostBuildEvent> | 107 | <PostBuildEvent> |
110 | </PostBuildEvent> | 108 | </PostBuildEvent> |
111 | </PropertyGroup> | 109 | </PropertyGroup> |
112 | </Project> \ No newline at end of file | 110 | </Project> |
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build index 51cecb9..91dd6f5 100644 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build +++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build | |||
@@ -12,6 +12,7 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="TerrainEngine.cs" /> | 14 | <include name="TerrainEngine.cs" /> |
15 | <include name="TerrainFilter.cs" /> | ||
15 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
16 | </sources> | 17 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
@@ -20,6 +21,7 @@ | |||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 22 | </lib> |
22 | <include name="../../bin/libTerrain-BSD.dll" /> | 23 | <include name="../../bin/libTerrain-BSD.dll" /> |
24 | <include name="Microsoft.JScript.dll" /> | ||
23 | <include name="../../bin/openjpegnet.dll" /> | 25 | <include name="../../bin/openjpegnet.dll" /> |
24 | <include name="System.dll" /> | 26 | <include name="System.dll" /> |
25 | <include name="System.Data.dll" /> | 27 | <include name="System.Data.dll" /> |