diff options
| -rw-r--r-- | main/Main.sln | 4 | ||||
| -rw-r--r-- | main/mdtool.in | 2 | ||||
| -rw-r--r-- | main/src/tools/mdrun/Makefile.am | 2 | ||||
| -rw-r--r-- | main/src/tools/mdrun/mdrun.csproj | 27 |
4 files changed, 10 insertions, 25 deletions
diff --git a/main/Main.sln b/main/Main.sln index f543275b1f..a53ad6c3b3 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -471,8 +471,8 @@ Global {875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|x86.Build.0 = Debug|Any CPU
{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.Build.0 = Release|Any CPU
- {8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|x86
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|x86.ActiveCfg = Debug|x86
diff --git a/main/mdtool.in b/main/mdtool.in index 30f44c99e2..a6fec1831a 100644 --- a/main/mdtool.in +++ b/main/mdtool.in @@ -2,7 +2,7 @@ #this script should be in $PREFIX/bin MONO_EXEC="exec -a mdtool mono" -EXE_PATH="${0%%/bin/mdtool}/lib/monodevelop/bin/mdrun.exe" +EXE_PATH="${0%%/bin/mdtool}/lib/monodevelop/bin/mdtool.exe" ##NOTE: remove this for stable releases if [ -z "$MD_NO_DEBUG" ]; then diff --git a/main/src/tools/mdrun/Makefile.am b/main/src/tools/mdrun/Makefile.am index 4029601c1a..ddc5d7ff73 100644 --- a/main/src/tools/mdrun/Makefile.am +++ b/main/src/tools/mdrun/Makefile.am @@ -1,5 +1,5 @@ -ASSEMBLY = $(top_builddir)/build/bin/mdrun.exe +ASSEMBLY = $(top_builddir)/build/bin/mdtool.exe FILES = src/AssemblyInfo.cs \ src/mdrun.cs diff --git a/main/src/tools/mdrun/mdrun.csproj b/main/src/tools/mdrun/mdrun.csproj index 32c543ee72..5881718ca6 100644 --- a/main/src/tools/mdrun/mdrun.csproj +++ b/main/src/tools/mdrun/mdrun.csproj @@ -2,31 +2,20 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> <ProductVersion>9.0.21022</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}</ProjectGuid> <OutputType>Exe</OutputType> - <AssemblyName>mdrun</AssemblyName> <RootNamespace>mdrun</RootNamespace> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>..\..\..\build\bin\</OutputPath> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <Execution> - <Execution clr-version="Net_2_0" /> - </Execution> + <AssemblyName>mdtool</AssemblyName> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\build\bin\</OutputPath> + <OutputPath>..\..\..\build\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <PlatformTarget>x86</PlatformTarget> @@ -34,15 +23,11 @@ <Execution clr-version="Net_2_0" /> </Execution> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <DebugType>none</DebugType> - <Optimize>true</Optimize> - <OutputPath>..\..\..\build\bin\</OutputPath> - <ErrorReport>prompt</ErrorReport> + <Optimize>false</Optimize> + <OutputPath>..\..\..\build\bin</OutputPath> <WarningLevel>4</WarningLevel> - <Execution> - <Execution clr-version="Net_2_0" /> - </Execution> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> |