From b2a29cb84f282b6eae3b3f4d6ce81509b43c7dec Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Thu, 13 Mar 2014 10:56:19 -0700
Subject: [PATCH] Fixes for Linux build.

---
 interface/CMakeLists.txt      | 6 +-----
 interface/interface_en.ts     | 8 ++++----
 interface/src/Application.cpp | 2 --
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 1cb0344f86..f39e7d7e50 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -230,11 +230,7 @@ if (APPLE)
         RUNTIME DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/install" COMPONENT Runtime
     )
 else (APPLE)
-  # remove and then copy the resources files beside the executable
-  add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E remove_directory
-    $<TARGET_FILE_DIR:${TARGET_NAME}>/resources
-  )
+  # copy the resources files beside the executable
   add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
     "${PROJECT_SOURCE_DIR}/resources"
diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index 1d962393d7..80433032dc 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -4,22 +4,22 @@
 <context>
     <name>Application</name>
     <message>
-        <location filename="src/Application.cpp" line="1354"/>
+        <location filename="src/Application.cpp" line="1353"/>
         <source>Export Voxels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="1355"/>
+        <location filename="src/Application.cpp" line="1354"/>
         <source>Sparse Voxel Octree Files (*.svo)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3554"/>
+        <location filename="src/Application.cpp" line="3557"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3555"/>
+        <location filename="src/Application.cpp" line="3558"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8091e58545..96129e0161 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -121,8 +121,6 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
 QString& Application::resourcesPath() {
 #ifdef Q_OS_MAC
     static QString staticResourcePath = QCoreApplication::applicationDirPath() + "/../Resources/";
-#elif defined Q_OS_LINUX
-    static QString staticResourcePath = "resources/";
 #else
     static QString staticResourcePath = QCoreApplication::applicationDirPath() + "/resources/";
 #endif