ide; fixed resource files that have a $ in their file name. closes #702.

[sdk] / ide / src / project / ProjectNode.ec

diff --git a/ide/src/project/ProjectNode.ec b/ide/src/project/ProjectNode.ec
index c9589b1..0c2bbc2 100644 (file)
--- a/ide/src/project/ProjectNode.ec
+++ b/ide/src/project/ProjectNode.ec
@@ -1375,7 +1375,7 @@ private:
                strcpy(tempPath, path);
                PathCatSlash(tempPath, name);
             }
-            ReplaceSpaces(modulePath, tempPath);
+            ReplaceUnwantedMakeChars(modulePath, tempPath);
             sprintf(s, "%s%s%s%s", ts.a, useRes ? "$(RES)" : "", modulePath, ts.b);
             items.Add(CopyString(s));
          }
@@ -1386,8 +1386,8 @@ private:
                   !strcmpi(extension, "m") || !strcmpi(extension, "mm"))
             {
                char modulePath[MAX_LOCATION];
-               ReplaceSpaces(modulePath, path);
-               ReplaceSpaces(moduleName, name);
+               ReplaceUnwantedMakeChars(modulePath, path);
+               ReplaceUnwantedMakeChars(moduleName, name);
                sprintf(s, "%s%s%s%s%s", ts.a, modulePath, path[0] ? SEPS : "", moduleName, ts.b);
                items.Add(CopyString(s));
             }
@@ -1425,7 +1425,7 @@ private:
                bool collision;
                NameCollisionInfo info;
                count++;
-               ReplaceSpaces(moduleName, name);
+               ReplaceUnwantedMakeChars(moduleName, name);
                StripExtension(moduleName);
                info = namesInfo[moduleName];
                collision = info ? info.IsExtensionColliding(extension) : false;
@@ -2053,12 +2053,12 @@ private:
                   strcpy(tempPath, child.path);
                   PathCatSlash(tempPath, child.name);
                }
-               ReplaceSpaces(resPath, tempPath);
+               ReplaceUnwantedMakeChars(resPath, tempPath);
                if(strchr(tempPath, ' '))
                   quotes = "\"";
                else
                   quotes = "";
-               f.Printf(" %s%s%s%s", quotes, useRes ? "$(RES)" : "", tempPath, quotes);
+               f.Printf(" %s%s%s%s", quotes, useRes ? "$(RES)" : "", resPath, quotes);
                count++;
             }
             if(count == 10 || (count > 0 && (ts || !child.next)))