Changeset 1313 in 3DVCSoftware for trunk/build/vc10/TLibExtractor_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/TLibExtractor_vc10.vcxproj

    r43 r1313  
    6868    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6969    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     70    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
     71    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    7072    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    7173    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    8688    <ClCompile>
    8789      <Optimization>Disabled</Optimization>
     90      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8891      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8992      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9295      <WarningLevel>Level3</WarningLevel>
    9396      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    94       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     97    </ClCompile>
     98  </ItemDefinitionGroup>
     99  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     100    <Midl>
     101      <TargetEnvironment>X64</TargetEnvironment>
     102    </Midl>
     103    <ClCompile>
     104      <Optimization>Disabled</Optimization>
     105      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     106      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     107      <MinimalRebuild>true</MinimalRebuild>
     108      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     109      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     110      <WarningLevel>Level3</WarningLevel>
     111      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    95112    </ClCompile>
    96113  </ItemDefinitionGroup>
    … …  
    101118      <IntrinsicFunctions>false</IntrinsicFunctions>
    102119      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    103       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     120      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     121      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104122      <StringPooling>true</StringPooling>
    105123      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    106124      <FunctionLevelLinking>true</FunctionLevelLinking>
    107       <WarningLevel>Level3</WarningLevel>
    108       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    109       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    110     </ClCompile>
    111   </ItemDefinitionGroup>
    112   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    113     <Midl>
    114       <TargetEnvironment>X64</TargetEnvironment>
    115     </Midl>
    116     <ClCompile>
    117       <Optimization>Disabled</Optimization>
    118       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <MinimalRebuild>true</MinimalRebuild>
    120       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    121       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    122125      <WarningLevel>Level3</WarningLevel>
    123126      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    133136      <IntrinsicFunctions>false</IntrinsicFunctions>
    134137      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    135       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     138      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     139      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    136140      <StringPooling>true</StringPooling>
    137141      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Note: See TracChangeset for help on using the changeset viewer.