Mercurial > projects > qtd

diff generator/main.cpp @ 384:d2f48c4cb3e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Same behavior of shared libs on linux and windows. Minor build script fixes.
author Max Samukha <maxter@spambox.com>
date Fri, 16 Jul 2010 20:04:29 +0300
parents 6cd923119ab1
children
line wrap: on
line diff
--- a/generator/main.cpp	Mon Jul 12 22:50:58 2010 +0300
+++ b/generator/main.cpp	Fri Jul 16 20:04:29 2010 +0300
@@ -46,15 +46,12 @@
 #include "generatorset.h"
 #include "fileout.h"
 #include "binder.h"
+#include "global.h"
 
 #include "abstractmetalang.h"
 
 #include <QDir>
 
-bool cpp_shared;
-bool dPhobos = false;
-int dVersion = 1;
-
 void ReportHandler_message_handler(const std::string &str)
 {
     ReportHandler::warning(QString::fromStdString(str));
@@ -130,19 +127,20 @@
         TypeDatabase::instance()->setRebuildClasses(classes);
     }
 
-    if (args.contains("d-target"))
+    QString dTarget = args.value("d-target");
+    if (!dTarget.isEmpty())
     {
-        QString dTarget = args.value("d-target");
+        dTarget = args.value("d-target");
         if (dTarget == "d1-tango")
-            dVersion = 1;
+            global.dVersion = 1;
         /*
         else if (dtarget == "d2-tango")
             qFatal("Tango D2 target is not supported");
         */
         else if (dTarget == "d2-phobos")
         {
-            dVersion = 2;
-            dPhobos = true;
+            global.dVersion = 2;
+            global.dPhobos = true;
         }
         else
         {
@@ -179,7 +177,9 @@
     if (!gs->readParameters(args))
         displayHelp(gs);
 
-    cpp_shared = args.contains("cpp_shared");
+    global.cppShared = args.contains("cpp-shared");
+
+    global.setTargetPlatform(args.value("target-platform"));
 
     printf("Running the QtD Generator. Please wait while source files are being generated...\n");