uppsrc_part1.diff

The diff file to apply for uppsrc directory (first part) - Sender Ghost, 11/06/2011 10:54 AM

Download (1.18 KB)

View differences:

uppsrc/ide/Builders/MscBuilder.icpp 2011-11-06 15:25:42 +0600
80 80 
//	cc << (IsMsc64() ? " -nologo -Wp64 -W3 -GR -c" : " -nologo -W3 -GR -c");
81 81 
	cc << " -nologo -W3 -GR -c";
82 82 
	cc << IncludesDefinesTargetTime(package, pkg);
83 
	if(HasFlag("CLR"))
84 
		cc << " -DflagUSEMALLOC";
85 

  		




  83
  86
  
    
	return cc;


  		




  84
  87
  
    
}


  		




  85
  88
  
    

  		




  ......




  160
  163
  
    
	IdeConsoleBeginGroup(package);


  		




  161
  164
  
    
	Vector<String> obj;


  		




  162
  165
  
    

  		




  163
  
  
    
	bool is_shared = HasFlag("SO");


  		




  
  166
  
    
	bool is_shared = HasFlag("SO"),


  		




  
  167
  
    
		is_clr = HasFlag("CLR");


  		




  164
  168
  
    

  		




  165
  169
  
    
	String cc = CmdLine(package, pkg);


  		




  166
  170
  
    
	if(HasFlag("EVC")) {


  		




  ......




  170
  174
  
    
		      " -GX-"; // turn off exception handling


  		




  171
  175
  
    
	}


  		




  172
  176
  
    
	else


  		




  
  177
  
    
	if(is_clr)


  		




  
  178
  
    
		cc << " -EHac";


  		




  
  179
  
    
	else


  		




  173
  180
  
    
	if(IsMsc89())


  		




  174
  181
  
    
		cc << " -EHsc";


  		




  175
  182
  
    
	else


  		




  ......




  186
  193
  
    
	if(HasFlag("DEBUG_FULL"))


  		




  187
  194
  
    
		cc << " -Zi";


  		




  188
  195
  
    
	cc << ' ' << Gather(pkg.option, config.GetKeys());


  		




  189
  
  
    
	cc << (HasFlag("SHARED") || is_shared ? " -MD"


  		




  
  196
  
    
	cc << (HasFlag("SHARED") || is_shared || is_clr ? " -MD"


  		




  190
  197
  
    
	      : (HasFlag("MT") || IsMsc89()) ? " -MT" : " -ML");


  		




  191
  198
  
    

  		




  192
  199
  
    
	String cc_size = cc;