From b381ef6faed812d827311acc22572664383ed1ff Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Wed, 11 Feb 2015 20:42:31 +0100
Subject: [PATCH] Add the data directory to the search path.

--HG--
branch : hotfix
---
 code/studio/src/plugins/core/CMakeLists.txt            |  4 ++++
 code/studio/src/plugins/core/core_config.h.cmake       |  7 +++++++
 .../src/plugins/core/search_paths_settings_page.cpp    | 10 +++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 code/studio/src/plugins/core/core_config.h.cmake

diff --git a/code/studio/src/plugins/core/CMakeLists.txt b/code/studio/src/plugins/core/CMakeLists.txt
index 2c21c9b58..db99b807c 100644
--- a/code/studio/src/plugins/core/CMakeLists.txt
+++ b/code/studio/src/plugins/core/CMakeLists.txt
@@ -38,6 +38,10 @@ SET(OVQT_CORE_PLUGIN_UIS	settings_dialog.ui
 
 SET(OVQT_CORE_PLUGIN_RCS core.qrc)
 
+IF(NOT WIN32)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/core_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/core_config.h)
+ENDIF(NOT WIN32)
+
 SET(QT_USE_QTGUI TRUE)
 SET(QT_USE_QTOPENGL TRUE)
 
diff --git a/code/studio/src/plugins/core/core_config.h.cmake b/code/studio/src/plugins/core/core_config.h.cmake
new file mode 100644
index 000000000..1aab54c12
--- /dev/null
+++ b/code/studio/src/plugins/core/core_config.h.cmake
@@ -0,0 +1,7 @@
+#ifndef CORE_CONFIG_H
+#define CORE_CONFIG_H
+
+#define STUDIO_DATA_DIR  "${OVQT_IMP_DATA_DIR}"
+
+#endif
+
diff --git a/code/studio/src/plugins/core/search_paths_settings_page.cpp b/code/studio/src/plugins/core/search_paths_settings_page.cpp
index e76d6c796..516d3d3f3 100644
--- a/code/studio/src/plugins/core/search_paths_settings_page.cpp
+++ b/code/studio/src/plugins/core/search_paths_settings_page.cpp
@@ -28,6 +28,10 @@
 #include <QtGui/QWidget>
 #include <QtGui/QFileDialog>
 
+#if !defined NL_OS_WINDOWS
+#include "core_config.h"
+#endif
+
 namespace Core
 {
 
@@ -118,6 +122,10 @@ void SearchPathsSettingsPage::applySearchPaths()
 	for (int i = 1; i < remapExt.size(); i += 2)
 		NLMISC::CPath::remapExtension(remapExt.at(i - 1).toUtf8().constData(), remapExt.at(i).toUtf8().constData(), true);
 
+#if !defined NL_OS_WINDOWS
+    NLMISC::CPath::addSearchPath(std::string(STUDIO_DATA_DIR), false, false);
+#endif
+
 	Q_FOREACH(QString path, paths)
 	{
 		NLMISC::CPath::addSearchPath(path.toUtf8().constData(), m_recurse, false);
@@ -216,4 +224,4 @@ void SearchPathsSettingsPage::checkEnabledButton()
 	m_ui.downToolButton->setEnabled(bEnabled);
 }
 
-} /* namespace Core */
\ No newline at end of file
+} /* namespace Core */