mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 13:05:22 +02:00
Code Issues Wiki Activity

bug 282092: Linker settings "Other Objects" not working on Windows (MinGW)

Browse source 
Patch from Marc-Andre Laperle
This commit is contained in:
Andrew Gvozdev 2009-09-13 16:20:50 +00:00
parent d1d5511415
commit 1ec7ef5ef2
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
View file

@ -1937,6 +1937,12 @@ public class BuildDescription implements IBuildDescription {
private BuildResource addInput(String path, BuildIOType buildArg){ private BuildResource addInput(String path, BuildIOType buildArg){
if(path.length() > 0){ if(path.length() > 0){
if(path.length() >= 2){
// Unquote path potentially quoted by FileListControl.getNewInputObject()
if(path.charAt(0) == '"' && path.charAt(path.length() -1) == '"') {
path = path.substring(1, path.length() -1);
}
}
IPath pPath = Path.fromOSString(path); IPath pPath = Path.fromOSString(path);
return addInput(pPath, buildArg); return addInput(pPath, buildArg);
} }

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
View file

@ -61,6 +61,10 @@ public class BuildResource implements IBuildResource {
* @see org.eclipse.cdt.managedbuilder.builddescription.IBuildResource#getLocation() * @see org.eclipse.cdt.managedbuilder.builddescription.IBuildResource#getLocation()
*/ */
public IPath getLocation() { public IPath getLocation() {
if(fFullWorkspacePath == null) {
return new Path(fLocationURI.getPath());
}
IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(fFullWorkspacePath); IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(fFullWorkspacePath);
if(resource == null) { if(resource == null) {
return new Path(fLocationURI.getPath()); return new Path(fLocationURI.getPath());