From 5a8f6fa2085c35206d2edf2b9f79260fe0c63b0b Mon Sep 17 00:00:00 2001
From: rti <none@none>
Date: Sun, 12 Dec 2010 22:12:45 +0100
Subject: [PATCH] Fixed: #1216 plugin and resource paths

---
 .../leveldesign/georges_editor_qt/src/main.cpp      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp
index 883b19d40..bbd2a4007 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main.cpp
@@ -3,6 +3,7 @@
 
 // Qt includes
 #include <QtGui/QApplication>
+#include <QDir>
 #include <QFile>
 #include <QDateTime>
 #include <QTextStream>
@@ -13,6 +14,7 @@
 #include <nel/misc/file.h>
 #include <nel/misc/path.h>
 #include <nel/misc/command.h>
+#include <nel/misc/dynloadlib.h>
 
 // Project includes
 #include "modules.h"
@@ -81,6 +83,15 @@ void messageHandler(QtMsgType p_type, const char* p_msg)
 
 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!
 	{
 		// 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);
 	}
 
-	QApplication app(argc, argv);
-
 	Modules::init();
 	//Modules::mainWin().resize(800,600);
 	Modules::mainWin().show();