Changeset 2310 for trunk/CrypStartup


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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypStartup/CrypStartup.csproj

    r2038 r2310  
    3333    <BootstrapperEnabled>true</BootstrapperEnabled>
    3434  </PropertyGroup>
    35   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    36     <PlatformTarget>x64</PlatformTarget>
    37     <OutputPath>..\CrypBuild\x64\Release</OutputPath>
     35  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     36    <PlatformTarget>x86</PlatformTarget>
     37    <OutputPath>..\CrypBuild\Release</OutputPath>
    3838    <ErrorReport>prompt</ErrorReport>
    3939    <WarningLevel>4</WarningLevel>
     
    4242    <DefineConstants>TRACE</DefineConstants>
    4343  </PropertyGroup>
    44   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    45     <PlatformTarget>x86</PlatformTarget>
    46     <OutputPath>..\CrypBuild\x86\Release</OutputPath>
    47     <ErrorReport>prompt</ErrorReport>
    48     <WarningLevel>4</WarningLevel>
    49     <DebugType>pdbonly</DebugType>
    50     <Optimize>true</Optimize>
    51     <DefineConstants>TRACE</DefineConstants>
    52   </PropertyGroup>
    53   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    54     <PlatformTarget>x64</PlatformTarget>
    55     <OutputPath>..\CrypBuild\x64\Debug</OutputPath>
    56     <ErrorReport>prompt</ErrorReport>
    57     <WarningLevel>4</WarningLevel>
    58     <DebugSymbols>true</DebugSymbols>
    59     <DebugType>full</DebugType>
    60     <Optimize>false</Optimize>
    61     <DefineConstants>DEBUG;TRACE</DefineConstants>
    62   </PropertyGroup>
    6344  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6445    <PlatformTarget>x86</PlatformTarget>
    65     <OutputPath>..\CrypBuild\x86\Debug</OutputPath>
     46    <OutputPath>..\CrypBuild\Debug</OutputPath>
    6647    <ErrorReport>prompt</ErrorReport>
    6748    <WarningLevel>4</WarningLevel>
     
    7758    <ApplicationIcon>cryptool.ico</ApplicationIcon>
    7859  </PropertyGroup>
    79   <ItemGroup Condition=" '$(Platform)' == 'x86' ">
     60  <ItemGroup>
    8061    <Reference Include="CrypWin">
    81       <HintPath>..\appspecialreferences\x86\crypwin.exe</HintPath>
     62      <HintPath>..\appspecialreferences\crypwin.exe</HintPath>
    8263      <Private>True</Private>
    8364    </Reference>
    84   </ItemGroup>
    85   <ItemGroup Condition=" '$(Platform)' == 'x64' ">
    86     <Reference Include="CrypWin">
    87       <HintPath>..\appspecialreferences\x64\crypwin.exe</HintPath>
    88       <Private>True</Private>
    89     </Reference>
    90   </ItemGroup>
    91   <ItemGroup>
    9265    <Reference Include="DevComponents.WpfDock">
    9366      <HintPath>..\AppReferences\DevComponents.WpfDock.dll</HintPath>
     
    189162  </PropertyGroup>
    190163  <PropertyGroup>
    191     <PreBuildEvent>xcopy  /E /Y "..\..\..\ProjectSamples" "$(TargetDir)ProjectSamples\"
    192 xcopy  /E /Y "..\..\..\AppDataStore" "$(TargetDir)AppDataStore\"
    193 xcopy  /E /Y "..\..\..\AppReferences\$(Platform)" "$(TargetDir)AppReferences\"
    194 xcopy /Y "..\..\..\AppReferences" "$(TargetDir)AppReferences\"
    195 xcopy  /E /Y "..\..\..\AppSpecialReferences\$(Platform)\AnotherEditor.dll" "$(TargetDir)CrypPlugins\"
     164    <PreBuildEvent>xcopy  /E /Y "..\..\ProjectSamples" "$(TargetDir)ProjectSamples\"
     165xcopy  /E /Y "..\..\AppDataStore" "$(TargetDir)AppDataStore\"
     166xcopy  /Y "..\..\AppReferences" "$(TargetDir)AppReferences\"
     167xcopy  /E /Y "..\..\AppSpecialReferences\AnotherEditor.dll" "$(TargetDir)CrypPlugins\"
    196168</PreBuildEvent>
    197169  </PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.