Fix SWIG generation for maps

[frida/frida.git] / src / main.cxx

diff --git a/src/main.cxx b/src/main.cxx
index 290657d52004b6f9529575658cca7b6ee356f03a..d284d4fcb0a3e685d797877182465505f9bb25a7 100644 (file)
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -1,6 +1,5 @@
 #include "disassembler/llvm/include_llvm.hxx"
 
-#include <iostream>
 #include <climits>
 
 #include <QApplication>
@@ -19,23 +18,22 @@
 #include "gui/Mainwindow.hxx"
 #include "core/InformationManager.hxx"
 #include "disassembler/llvm/LLVMDisassembler.hxx"
-
-using std::cout;
-using std::cin;
-using std::cerr;
+#include "Config.hxx"
 
 int main(int argc, char** argv)
 {
        QApplication app(argc, argv);
 
-    log4cxx::BasicConfigurator::configure();
-    log4cxx::LoggerPtr _logger(log4cxx::Logger::getLogger("main"));
+       log4cxx::BasicConfigurator::configure();
+       log4cxx::LoggerPtr _logger(log4cxx::Logger::getLogger("main"));
 
 #ifdef ARGPARSE
        QCommandLineParser parser;
 #endif
 
        QApplication::setApplicationName("frida");
+       QApplication::setApplicationVersion("0.0");
+       QApplication::addLibraryPath(CONFIG_LIBDIR "/frida/plugins/Interpreter");
 #ifdef ARGPARSE
        parser.addHelpOption();
        parser.addVersionOption();
@@ -46,13 +44,13 @@ int main(int argc, char** argv)
 
        InformationManager iman;
 
-    LOG4CXX_DEBUG(_logger, "Initializing LLVM");
-    llvm::InitializeAllTargetInfos();
-    llvm::InitializeAllTargetMCs();
-    llvm::InitializeAllAsmParsers();
-    llvm::InitializeAllDisassemblers();
+       LOG4CXX_DEBUG(_logger, "Initializing LLVM");
+       llvm::InitializeAllTargetInfos();
+       llvm::InitializeAllTargetMCs();
+       llvm::InitializeAllAsmParsers();
+       llvm::InitializeAllDisassemblers();
 
-    LOG4CXX_DEBUG(_logger, "Initializing Qt");
+       LOG4CXX_DEBUG(_logger, "Initializing Qt");
 
        std::string filename = "";
 #ifdef ARGPARSE