Changeset 1313 in 3DVCSoftware for trunk/build/vc10/TAppExtractor_vc10.vcxproj


Ignore:
Timestamp:
13 Aug 2015, 17:38:13 (9 years ago)
Author:
tech
Message:

Merged 14.1-update-dev1@1312.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build/vc10/TAppExtractor_vc10.vcxproj

    r43 r1313  
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6666    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     67    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
     68    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     69    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    6770    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    6871    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6972    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    72     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    7373    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    7474    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    9090    <ClCompile>
    9191      <Optimization>Disabled</Optimization>
     92      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9293      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9394      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9697      <WarningLevel>Level3</WarningLevel>
    9798      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    98       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    9999    </ClCompile>
    100100    <Link>
    … …  
    102102      <SubSystem>Console</SubSystem>
    103103      <TargetMachine>MachineX86</TargetMachine>
     104    </Link>
     105  </ItemDefinitionGroup>
     106  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     107    <Midl>
     108      <TargetEnvironment>X64</TargetEnvironment>
     109    </Midl>
     110    <ClCompile>
     111      <Optimization>Disabled</Optimization>
     112      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     113      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     114      <MinimalRebuild>true</MinimalRebuild>
     115      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     116      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     117      <WarningLevel>Level3</WarningLevel>
     118      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     119    </ClCompile>
     120    <Link>
     121      <GenerateDebugInformation>true</GenerateDebugInformation>
     122      <SubSystem>Console</SubSystem>
     123      <TargetMachine>MachineX64</TargetMachine>
    104124    </Link>
    105125  </ItemDefinitionGroup>
    … …  
    110130      <IntrinsicFunctions>false</IntrinsicFunctions>
    111131      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    112       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     132      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     133      <PreprocessorDefinitions>WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    113134      <StringPooling>true</StringPooling>
    114135      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    116137      <WarningLevel>Level3</WarningLevel>
    117138      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    118       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    119139    </ClCompile>
    120140    <Link>
    … …  
    122142      <SubSystem>Console</SubSystem>
    123143      <TargetMachine>MachineX86</TargetMachine>
    124     </Link>
    125   </ItemDefinitionGroup>
    126   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    127     <Midl>
    128       <TargetEnvironment>X64</TargetEnvironment>
    129     </Midl>
    130     <ClCompile>
    131       <Optimization>Disabled</Optimization>
    132       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133       <MinimalRebuild>true</MinimalRebuild>
    134       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    135       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    136       <WarningLevel>Level3</WarningLevel>
    137       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    138     </ClCompile>
    139     <Link>
    140       <GenerateDebugInformation>true</GenerateDebugInformation>
    141       <SubSystem>Console</SubSystem>
    142       <TargetMachine>MachineX64</TargetMachine>
    143144    </Link>
    144145  </ItemDefinitionGroup>
    … …  
    152153      <IntrinsicFunctions>false</IntrinsicFunctions>
    153154      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    154       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     155      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     156      <PreprocessorDefinitions>WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    155157      <StringPooling>true</StringPooling>
    156158      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Note: See TracChangeset for help on using the changeset viewer.