Changeset 2310 for trunk/CrypTool


Ignore:
Timestamp:
Jan 11, 2011, 2:49:14 PM (11 years ago)
Author:
Matthäus Wander
Message:

Consolidating x64 and x86 build targets. Please use only "x86", see #172.

override-bad-extension: Bdev.Net.Dns.dll
override-bad-extension: Bootstrapper.dll
override-bad-extension: Bootstrapper.pdb
override-bad-extension: CertificateLibrary.dll
override-bad-extension: CertificateLibrary.pdb
override-bad-extension: CertServices.dll
override-bad-extension: CertServices.pdb
override-bad-extension: Chord.dll
override-bad-extension: Chord.pdb
override-bad-extension: FullMeshDHT.dll
override-bad-extension: FullMeshDHT.pdb
override-bad-extension: FullMeshOverlay.dll
override-bad-extension: FullMeshOverlay.pdb
override-bad-extension: Gears4Net.dll
override-bad-extension: Gears4Net.pdb
override-bad-extension: LinkManager.dll
override-bad-extension: LinkManager.pdb
override-bad-extension: log4net.dll
override-bad-extension: log4net.pdb
override-bad-extension: msieve.dll
override-bad-extension: MySQLDHT.dll
override-bad-extension: MySQLDHT.pdb
override-bad-extension: NativeCryptography.dll
override-bad-extension: PapsClient.dll
override-bad-extension: PapsClient.pdb
override-bad-extension: PeersAtPlayBase.dll
override-bad-extension: PeersAtPlayBase.pdb
override-bad-extension: RUDP.dll
override-bad-extension: RUDP.pdb
override-bad-extension: Stun.dll
override-bad-extension: Stun.pdb
override-bad-extension: Util.dll
override-bad-extension: Util.pdb
override-bad-extension: WebDHT.dll
override-bad-extension: WebDHT.pdb
override-bad-extension: AnotherEditor.dll
override-bad-extension: CrypWin.exe

Location:
trunk/CrypTool
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypTool/CrypTool.csproj

    r1487 r2310  
    1717    <WarningLevel>4</WarningLevel>
    1818  </PropertyGroup>
    19   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    20     <PlatformTarget>x64</PlatformTarget>
    21     <OutputPath>..\CrypBuild\x64\Release</OutputPath>
     19  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     20    <PlatformTarget>x86</PlatformTarget>
     21    <OutputPath>..\CrypBuild\Release</OutputPath>
    2222    <ErrorReport>prompt</ErrorReport>
    2323    <WarningLevel>4</WarningLevel>
     
    2626    <DefineConstants>TRACE</DefineConstants>
    2727  </PropertyGroup>
    28   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     28  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    2929    <PlatformTarget>x86</PlatformTarget>
    30     <OutputPath>..\CrypBuild\x86\Release</OutputPath>
    31     <ErrorReport>prompt</ErrorReport>
    32     <WarningLevel>4</WarningLevel>
    33     <DebugType>pdbonly</DebugType>
    34     <Optimize>true</Optimize>
    35     <DefineConstants>TRACE</DefineConstants>
    36   </PropertyGroup>
    37   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    38     <PlatformTarget>x64</PlatformTarget>
    39     <OutputPath>..\CrypBuild\x64\Debug</OutputPath>
     30    <OutputPath>..\CrypBuild\Debug</OutputPath>
    4031    <ErrorReport>prompt</ErrorReport>
    4132    <WarningLevel>4</WarningLevel>
     
    4536    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4637  </PropertyGroup>
    47   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    48     <PlatformTarget>x86</PlatformTarget>
    49     <OutputPath>..\CrypBuild\x86\Debug</OutputPath>
    50     <ErrorReport>prompt</ErrorReport>
    51     <WarningLevel>4</WarningLevel>
    52     <DebugSymbols>true</DebugSymbols>
    53     <DebugType>full</DebugType>
    54     <Optimize>false</Optimize>
    55     <DefineConstants>DEBUG;TRACE</DefineConstants>
    56   </PropertyGroup>
    57   <ItemGroup Condition=" '$(Platform)' == 'x86' " />
    58   <ItemGroup Condition=" '$(Platform)' == 'x64' " />
    5938  <ItemGroup>
    6039    <Reference Include="Odyssey">
  • trunk/CrypTool/CrypTool.sln

    r1423 r2310  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypTool", "CrypTool.csproj", "{CFC42945-D50A-4428-AC8C-4C9CC5589BA1}"
     4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypTool", "CrypTool.csproj", "{3A40A779-9A54-4633-8A3C-CE0AD4623A85}"
    55EndProject
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypCore", "..\CrypCore\CrypCore.csproj", "{FF5D473C-0716-4D3E-9078-2EBD979F94C6}"
     
    88Global
    99        GlobalSection(SolutionConfigurationPlatforms) = preSolution
    10                 Debug|Any CPU = Debug|Any CPU
    11                 Debug|x64 = Debug|x64
    1210                Debug|x86 = Debug|x86
    13                 Release|Any CPU = Release|Any CPU
    14                 Release|x64 = Release|x64
    1511                Release|x86 = Release|x86
    1612        EndGlobalSection
    1713        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    18                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|Any CPU.ActiveCfg = Debug|x86
    19                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|x64.ActiveCfg = Debug|x86
    20                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|x86.ActiveCfg = Debug|x86
    21                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|x86.Build.0 = Debug|x86
    22                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|Any CPU.ActiveCfg = Release|x86
    23                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|x64.ActiveCfg = Release|x86
    24                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|x86.ActiveCfg = Release|x86
    25                 {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|x86.Build.0 = Release|x86
    26                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    27                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
    28                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x64.ActiveCfg = Debug|x64
    29                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x64.Build.0 = Debug|x64
     14                {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Debug|x86.ActiveCfg = Debug|x86
     15                {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Debug|x86.Build.0 = Debug|x86
     16                {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Release|x86.ActiveCfg = Release|x86
     17                {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Release|x86.Build.0 = Release|x86
    3018                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x86.ActiveCfg = Debug|x86
    3119                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x86.Build.0 = Debug|x86
    32                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
    33                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|Any CPU.Build.0 = Release|Any CPU
    34                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x64.ActiveCfg = Release|x64
    35                 {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x64.Build.0 = Release|x64
    3620                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x86.ActiveCfg = Release|x86
    3721                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x86.Build.0 = Release|x86
Note: See TracChangeset for help on using the changeset viewer.