subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r930269 - in /subversion/trunk/build/generator/templates: vcnet_vcproj.ezt vcnet_vcxproj.ezt
Date Fri, 02 Apr 2010 13:34:11 GMT
Author: rhuijben
Date: Fri Apr  2 13:34:11 2010
New Revision: 930269

URL: http://svn.apache.org/viewvc?rev=930269&view=rev
Log:
* generator/templates/vcnet_vcproj.ezt
* generator/templates/vcnet_vcxproj.ezt
  For Visual Studio 2002-2010, resolve a Windows-only library import
  warning, by ignoring the release build C runtime in debug builds.

Modified:
    subversion/trunk/build/generator/templates/vcnet_vcproj.ezt
    subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt

Modified: subversion/trunk/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_vcproj.ezt?rev=930269&r1=930268&r2=930269&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_vcproj.ezt Fri Apr  2 13:34:11 2010
@@ -76,7 +76,7 @@
 [else]				LinkIncremental="1"
 [end]				AdditionalLibraryDirectories="..\..\..\db4-win32\lib;[for configs.libdirs][configs.libdirs];[end]"
 				TargetMachine="[is platforms "Win32"]1[end][is platforms "x64"]17[end]"
-				IgnoreDefaultLibraryNames="libc.lib"
+				IgnoreDefaultLibraryNames="libc.lib[is configs.name "debug"];msvcrt.lib[end]"
 [if-any def_file]				ModuleDefinitionFile="[def_file]"
 [end]				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"[is configs.name "Debug"]
@@ -89,7 +89,8 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalOptions="[is platforms "win32"]/MACHINE:X86[end][is platforms "x64"]/MACHINE:X64[end]"
-				OutputFile="$(OutDir)\[target.output_name]"/>
+				OutputFile="$(OutDir)\[target.output_name]"[is configs.name "debug"]
+				IgnoreDefaultLibraryNames="msvcrt.lib"[end]/>
 [end]			<Tool
 				Name="VCMIDLTool"/>
 			<Tool

Modified: subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt?rev=930269&r1=930268&r2=930269&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt Fri Apr  2 13:34:11 2010
@@ -67,17 +67,20 @@
       <AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-[is configs.name "Debug"][else]    <OptimizeReferences>true</OptimizeReferences>
+[is configs.name "Debug"]      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
+[else]      <OptimizeReferences>true</OptimizeReferences>
 [end]    </Link>
 [else][is config_type "DynamicLibrary"]    <Link>
       <AdditionalDependencies>[for configs.libs][configs.libs];[end]%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-[if-any def_file]      <ModuleDefinitionFile>[def_file]</ModuleDefinitionFile>
+[is configs.name "Debug"]      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
+[end][if-any def_file]      <ModuleDefinitionFile>[def_file]</ModuleDefinitionFile>
 [end]    </Link>
 [else][is config_type "StaticLibrary"]    <Lib>
       <TargetMachine>[is platforms "X64"]MachineX64[else]MachineX86[end]</TargetMachine>
-    </Lib>
+[is configs.name "Debug"]      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
+[end]    </Lib>
 [end][end][end]  </ItemDefinitionGroup>
 [end][end][if-any target.desc]  <ItemGroup>
     <ResourceCompile Include="..\svn.rc">



Mime
View raw message