305_uppsrc.diff

The diff file to apply for uppsrc directory - Sender Ghost, 07/01/2012 04:43 AM

Download (2.09 KB)

View differences:

uppsrc/ide/Assist.cpp 2012-07-01 06:01:48 +0400
350 350 
			+ ";/usr/include;/usr/local/include"
351 351 
#endif
352 352 
		);
353 
		// Also adding internal includes
354 
		const Workspace& wspc = GetIdeWorkspace();
355 
		for(int i = 0; i < wspc.GetCount(); i++) {
356 
			const Package& pkg = wspc.GetPackage(i);
357 
			for(int j = 0; j < pkg.include.GetCount(); j++)
358 
				include.Add(SourcePath(wspc[i], pkg.include[j].text));
359 
		}
353 360 
		include_local = false;
354 361 
	}
355 362 
	include_path.Clear();
......
1063 1070 
			return;
1064 1071 
		}
1065 1072 
	}
1066 
	int q = l.Find("#include");
1067 
	if(q >= 0) {
1068 
		String path = FindIncludeFile(~l + q + 8, GetFileFolder(editfile));
1073 
	CParser p(l);
1074 
	if(p.Char('#') && p.Id("include")) {
1075 
		String path = FindIncludeFile(p.GetPtr(), GetFileFolder(editfile));
1069 1076 
		if(!IsNull(path)) {
1070 1077 
			AddHistory();
1071 1078 
			EditFile(path);
1072 1079 
		}
1073 1080 
		return;
1074 1081 
	}
1075 
	q = pos;
1082 
	int q = pos;
1076 1083 
	while(iscid(editor.Ch(q - 1)))
1077 1084 
		q--;
1078 1085 
	String tp;
uppsrc/ide/Builders/Build.cpp 2012-07-01 04:49:53 +0400
463 463 

  		




  464
  464
  
    
void MakeBuild::SetHdependDirs()


  		




  465
  465
  
    
{


  		




  466
  
  
    
	HdependSetDirs(SplitDirs(GetVar("UPP") + ';'


  		




  467
  
  
    
	                         + GetMethodVars(method).Get("INCLUDE", "") + ';'


  		




  468
  
  
    
	                         + Environment().Get("INCLUDE", "")));


  		




  
  466
  
    
	Vector<String> include = SplitDirs(GetVar("UPP") + ';'


  		




  
  467
  
    
		+ GetMethodVars(method).Get("INCLUDE", "") + ';'


  		




  
  468
  
    
		+ Environment().Get("INCLUDE", "")


  		




  
  469
  
    
#ifdef PLATFORM_POSIX


  		




  
  470
  
    
		+ ";/usr/include;/usr/local/include"


  		




  
  471
  
    
#endif


  		




  
  472
  
    
		);


  		




  
  473
  
    
	// Also adding internal includes


  		




  
  474
  
    
	const Workspace& wspc = GetIdeWorkspace();


  		




  
  475
  
    
	for(int i = 0; i < wspc.GetCount(); i++) {


  		




  
  476
  
    
		const Package& pkg = wspc.GetPackage(i);


  		




  
  477
  
    
		for(int j = 0; j < pkg.include.GetCount(); j++)


  		




  
  478
  
    
			include.Add(SourcePath(wspc[i], pkg.include[j].text));


  		




  
  479
  
    
	}


  		




  
  480
  
    

  		




  
  481
  
    
	HdependSetDirs(include);


  		




  469
  482
  
    
}


  		




  470
  483
  
    

  		




  471
  484
  
    
Vector<String> MakeBuild::GetAllUses(const Workspace& wspc, int f)