Fixed: #1216 plugin and resource paths
This commit is contained in:
parent
ad19524ed0
commit
adf3cea4b9
1 changed files with 11 additions and 2 deletions
|
@ -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();
|
||||||
|
|
Loading…
Reference in a new issue