Fixed: #1216 plugin and resource paths

This commit is contained in:
rti 2010-12-12 22:12:45 +01:00
parent 9526715c55
commit 5a8f6fa208

View file

@ -3,6 +3,7 @@
// Qt includes // Qt includes
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QDir>
#include <QFile> #include <QFile>
#include <QDateTime> #include <QDateTime>
#include <QTextStream> #include <QTextStream>
@ -13,6 +14,7 @@
#include <nel/misc/file.h> #include <nel/misc/file.h>
#include <nel/misc/path.h> #include <nel/misc/path.h>
#include <nel/misc/command.h> #include <nel/misc/command.h>
#include <nel/misc/dynloadlib.h>
// Project includes // Project includes
#include "modules.h" #include "modules.h"
@ -81,6 +83,15 @@ void messageHandler(QtMsgType p_type, const char* p_msg)
sint main(int argc, char **argv) sint main(int argc, char **argv)
{ {
QApplication app(argc, argv);
NLMISC::CApplicationContext myApplicationContext;
#if defined(NL_OS_MAC)
QDir::setCurrent(qApp->applicationDirPath() + QString("/../Resources"));
CLibrary::addLibPath(
(qApp->applicationDirPath() + QString("/../PlugIns/nel")).toStdString());
#endif
// go nel! // go nel!
{ {
// use log.log if NEL_LOG_IN_FILE and NLQT_USE_LOG_LOG defined as 1 // use log.log if NEL_LOG_IN_FILE and NLQT_USE_LOG_LOG defined as 1
@ -109,8 +120,6 @@ sint main(int argc, char **argv)
NLMISC::CPath::remapExtension("tga", "png", true); NLMISC::CPath::remapExtension("tga", "png", true);
} }
QApplication app(argc, argv);
Modules::init(); Modules::init();
//Modules::mainWin().resize(800,600); //Modules::mainWin().resize(800,600);
Modules::mainWin().show(); Modules::mainWin().show();