diff options
| author |  jtattermusch <jtattermusch@google.com> | 2014-12-09 12:47:19 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2014-12-09 16:20:55 -0800 |
| commit | 98bffb779b8c47f4d76c72c7807d9f1b1074a795 (patch) | |
| tree | 063f5c2c993d683fc2b3c5f0dd9f0be4b4f9e5c7 /templates | |
| parent | 5287817527403a2bda28ccdc47f9d5868b91d705 (diff) | |
Fixes for GPR library on Windows (+ getting rid of warnings under MS C++ compiler)
Change on 2014/12/09 by jtattermusch <jtattermusch@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=81704538
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vsprojects/vs2013/vcxproj_defs.include | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/vsprojects/vs2013/vcxproj_defs.include b/templates/vsprojects/vs2013/vcxproj_defs.include index 37fe97d4ea..fea86ddf36 100644 --- a/templates/vsprojects/vs2013/vcxproj_defs.include +++ b/templates/vsprojects/vs2013/vcxproj_defs.include @@ -47,6 +47,7 @@ project_dict = dict([(p.name, p) for p in projects]) <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v120</PlatformToolset> <CharacterSet>Unicode</CharacterSet> + <IntDir>$(Configuration)\$(ProjectName)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>${get_configuration_type(project.is_library)}</ConfigurationType> @@ -54,6 +55,7 @@ project_dict = dict([(p.name, p) for p in projects]) <PlatformToolset>v120</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <IntDir>$(Configuration)\$(ProjectName)\</IntDir> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -71,7 +73,7 @@ project_dict = dict([(p.name, p) for p in projects]) <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>$(SolutionDir)\..\..;$(SolutionDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -87,7 +89,7 @@ project_dict = dict([(p.name, p) for p in projects]) <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>$(SolutionDir)\..\..;$(SolutionDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> |