Fix Build All Libraries so that CMM and LMM are done correctly.

parallaxinc · Mar 12, 2017 · a02af1c · a02af1c
1 parent c1cd06c
commit a02af1c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/propside/buildc.cpp b/propside/buildc.cpp
@@ -132,14 +132,14 @@ int  BuildC::runBuild(QString option, QString projfile, QString compiler)
     {
         status->setText(tr("Building ..."));
 
-        QString model = projectOptions->getMemModel();
+        QString memmod = projectOptions->getMemModel();
         if (option.indexOf(BUILDALL_MEMTYPE) == 0) {
-            model = option.mid(option.indexOf("=")+1);
-            model = ">memtype="+model;
+            memmod = option.mid(option.indexOf("=")+1);
+            memmod = ">memtype="+memmod;
             option = "";
             for (int n = 0; n < list.length(); n++) {
                 if(list[n].contains(">memtype"))  {
-                    list[n] = model;
+                    list[n] = memmod;
                     break;
                 }
             }
@@ -1221,11 +1221,12 @@ int BuildC::getCompilerParameters(QStringList copts, QStringList *args)
     //portName = cbPort->itemText(cbPort->currentIndex());
     //boardName = cbBoard->itemText(cbBoard->currentIndex());
 
-    QString model = projectOptions->getMemModel();
+    //model = projectOptions->getMemModel();
     QString newmodel;
     if (copts.at(0).contains(BUILDALL_MEMTYPE)) {
         QString mopt = copts.at(0);
         newmodel = mopt.mid(mopt.indexOf("=")+1);
+        model = newmodel;
         copts.removeAt(0);
     }
     model = model.mid(0,model.indexOf(" ")); // anything after the first word is just description

diff --git a/propside/propside.pro b/propside/propside.pro
@@ -5,7 +5,7 @@
 # These define the version number in Menu->About
 DEFINES += IDEVERSION=1
 DEFINES += MINVERSION=1
-DEFINES += FIXVERSION=0
+DEFINES += FIXVERSION=1
 VERSION = IDEVERSION"."MINVERSION"."FIXVERSION
 
 QT += core