project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/image/AifdefFileConverter.java
equal
deleted
inserted
replaced
96 } else { |
96 } else { |
97 // either .mbm or .mbmdef allowed, theoretically, |
97 // either .mbm or .mbmdef allowed, theoretically, |
98 // but only .mbmdef available in Carbide UI |
98 // but only .mbmdef available in Carbide UI |
99 String mbmdefFile = matcher.group(3); |
99 String mbmdefFile = matcher.group(3); |
100 IPath mbmdefPath = resolver.resolvePath(projectPath.append(mbmdefFile).toOSString()); |
100 IPath mbmdefPath = resolver.resolvePath(projectPath.append(mbmdefFile).toOSString()); |
101 if (mbmdefPath.getDevice() == null) |
101 if (mbmdefPath.getDevice() == null && (!HostOS.IS_WIN32 && !mbmdefPath.isAbsolute())) |
102 mbmdefPath = new Path(projectPath.removeTrailingSeparator().lastSegment()).append(mbmdefPath); |
102 mbmdefPath = new Path(projectPath.removeTrailingSeparator().lastSegment()).append(mbmdefPath); |
103 String mbmdefText = readFileText(mbmdefPath); |
103 String mbmdefText = readFileText(mbmdefPath); |
104 IMultiImageSource multiImageSource = new MbmdefFileConverter().convert(targetPath, mbmdefFile, mbmdefText, resolver); |
104 IMultiImageSource multiImageSource = new MbmdefFileConverter().convert(targetPath, mbmdefFile, mbmdefText, resolver); |
105 if (multiImageSource.getSources().size() > 0) { |
105 if (multiImageSource.getSources().size() > 0) { |
106 IBitmapSource first = (IBitmapSource) multiImageSource.getSources().get(0); |
106 IBitmapSource first = (IBitmapSource) multiImageSource.getSources().get(0); |