Changeset 797 for mcbuilder/trunk/src/Builder.cpp

Timestamp:

08/09/08 14:06:42 (5 months ago)

Author:

liamstask

Message:

- update for directory structure of new firmware

Files:

• mcbuilder/trunk/src/Builder.cpp (modified) (5 diffs)

mcbuilder/trunk/src/Builder.cpp

@@ -250 +250 @@
           
           // add in the directories for the required libraries
-          QDir libdir(QDir::current().filePath("libraries"));
+          QDir libdir(QDir::current().filePath("cores/makecontroller/libraries"));
           foreach(Library lib, libraries)
             tofile << "  -I" << filteredPath(libdir.filePath(lib.name)) << " \\" << endl;
@@ -269 +269 @@
           tofile << "OBJCOPY=" << QDir::toNativeSeparators(toolsPath + "arm-elf-objcopy") << endl;
           tofile << "ARCH=" << QDir::toNativeSeparators(toolsPath + "arm-elf-ar") << endl;
-          tofile << "CRT0=" + filteredPath("resources/cores/makecontroller/startup/boot.s") << endl;
+          tofile << "CRT0=" + filteredPath("cores/makecontroller/core/startup/boot.s") << endl;
           QString debug = (projInfo->debug()) ? "-g" : "";
           tofile << "DEBUG=" + debug << endl;
@@ -284 +284 @@
             optLevel = "-O0";
           tofile << "OPTIM=" + optLevel << endl;
-          tofile << "LDSCRIPT=" + filteredPath("resources/cores/makecontroller/startup/atmel-rom.ld") << endl << endl;
+          tofile << "LDSCRIPT=" + filteredPath("cores/makecontroller/core/startup/atmel-rom.ld") << endl << endl;
 
           // the rest is always the same...
@@ -652 +652 @@
   QDir projDir(project);
   QStringList srcFiles = projDir.entryList(QStringList() << "*.c" << "*.h");
-  QDir libDir(QDir::current().filePath("libraries"));
+  QDir libDir(QDir::current().filePath("cores/makecontroller/libraries"));
   QStringList libDirs = libDir.entryList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot);
   
@@ -723 +723 @@
   if(!QDir::isAbsolutePath(path))
   {
-    if(path.startsWith("resources/cores"))
+    if(path.startsWith("cores"))
       filtered = QDir::current().filePath(path);
     else