From 5d5fa0fdf913907edbc3d2d29a7548f0cb658c94 Mon Sep 17 00:00:00 2001
From: Werner Schweer <ws.seh.de>
Date: Tue, 22 Dec 2009 13:55:58 +0000
Subject: build updates

---
 muse/CMakeLists.txt        | 8 ++++----
 muse/grepmidi/grepmidi.cpp | 4 ++--
 muse/share/CMakeLists.txt  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index 2286d40b..2d0f8a98 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -35,10 +35,6 @@ endif (NOT CMAKE_INSTALL_LIBDIR)
 # for debugging the make system uncomment next line:
 # set(CMAKE_VERBOSE_MAKEFILE ON)
 
-set(CMAKE_CXX_FLAGS         "-Wall -Wextra -Winvalid-pch -fno-exceptions")
-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fstrength-reduce")
-set(CMAKE_CXX_FLAGS_DEBUG   "-g -DQT_DEBUG")
-
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
@@ -331,5 +327,9 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   INCLUDE(CPack)
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
+set(CMAKE_CXX_FLAGS         "-Wl,-rpath,${QT_LIBRARY_DIR} -Wall -Wextra -Winvalid-pch -fno-exceptions")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fstrength-reduce")
+set(CMAKE_CXX_FLAGS_DEBUG   "-g -DQT_DEBUG")
+
 subdirs(al awl grepmidi plugins midiplugins muse share synti)
 
diff --git a/muse/grepmidi/grepmidi.cpp b/muse/grepmidi/grepmidi.cpp
index d5d68a4d..5e8a4f62 100644
--- a/muse/grepmidi/grepmidi.cpp
+++ b/muse/grepmidi/grepmidi.cpp
@@ -35,7 +35,7 @@
 
 int cpos;
 bool printName = false;
-const char* curName;
+char* curName;
 
 //---------------------------------------------------------
 //   readLong
@@ -277,7 +277,7 @@ int grep(FILE* f)
 //   grep
 //---------------------------------------------------------
 
-int grepMidi(const char* name)
+int grepMidi(char* name)
       {
       curName = name;
       char*p = strrchr(name, '.');
diff --git a/muse/share/CMakeLists.txt b/muse/share/CMakeLists.txt
index e9e24a12..bd87dd86 100644
--- a/muse/share/CMakeLists.txt
+++ b/muse/share/CMakeLists.txt
@@ -18,5 +18,5 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-subdirs( instruments locale plugins templates wallpapers locale)
+subdirs( instruments locale plugins templates wallpapers)
 
-- 
cgit v1.2.3