summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Schweer <ws.seh.de>2006-05-03 13:42:04 +0000
committerWerner Schweer <ws.seh.de>2006-05-03 13:42:04 +0000
commit7438e452af8f2d1ac23a23ff64d2fc7c2f6adda8 (patch)
tree0bef753c7a9d92b9352adde3ec82f977add9365c
parentf19e64c482b78b5ec7fc2bffe2b87f6a2430deb5 (diff)
fixes for target "make install"
-rw-r--r--muse/CMakeLists.txt2
-rw-r--r--muse/README11
-rw-r--r--muse/config.h22
-rwxr-xr-xmuse/gen9
-rwxr-xr-xmuse/grepmidi/grepmidibin17418 -> 17430 bytes
-rw-r--r--muse/plugins/freeverb/CMakeLists.txt2
-rw-r--r--muse/share/html/CMakeLists.txt5
7 files changed, 19 insertions, 32 deletions
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index 0457b9dd..e79b74a6 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -150,7 +150,7 @@ set(CMAKE_CXX_FLAGS
"-g -Wall -Wextra -Winvalid-pch -fno-exceptions -fno-rtti"
)
-subdirs(al awl grepmidi plugins midiplugins synti muse)
+subdirs(al awl grepmidi plugins midiplugins synti muse share)
include_directories(
.
diff --git a/muse/README b/muse/README
index df7d908a..49801b64 100644
--- a/muse/README
+++ b/muse/README
@@ -28,9 +28,7 @@ details.
- ALSA 1.0 or newer
http://www.alsa-project.org/
- - gcc 3.4.x
- NOTE: you should compile MusE with the same compiler
- you used to compile QT
+ - gcc 4.x.x
- libsndfile >= 1.0.1
http://www.zip.com.au/~erikd/libsndfile/
@@ -56,16 +54,15 @@ details.
tar xvofj muse-x.x.x.tar.bz2
- enter dirctory muse-x.x.x:
- MAKE SURE YOU SET YOUR 'QTDIR' ENVIRONMENT VARIABLE
- run configure
- run make all
+ run "ccmake" or "cmake ." to create Makefiles
+ run "make all"
- as root run:
make install
to install MusE
=============================
- some known bugs
+ known bugs
=============================
- many
diff --git a/muse/config.h b/muse/config.h
deleted file mode 100644
index 45bdd3e1..00000000
--- a/muse/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//=============================================================================
-// MusE
-// Linux Music Editor
-// $Id:$
-//
-// Copyright (C) 2002-2006 by Werner Schweer and others
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//=============================================================================
-
-/* #undef DSSI_SUPPORT */
-/* #undef VST_SUPPORT */
diff --git a/muse/gen b/muse/gen
index bde49506..14b9f33f 100755
--- a/muse/gen
+++ b/muse/gen
@@ -1,5 +1,14 @@
#!/bin/sh
+#
+# out of source build
+# all generated files go into subdirectory "build"
+#
+# NOTICE:
+# this does (yet) not work; for unknown reasons *.ui file
+# dependencies are not properly handled
+#
+
if test ! -d build;
then
echo "+creating build directory"
diff --git a/muse/grepmidi/grepmidi b/muse/grepmidi/grepmidi
index 5b16cc0b..bac08a8c 100755
--- a/muse/grepmidi/grepmidi
+++ b/muse/grepmidi/grepmidi
Binary files differ
diff --git a/muse/plugins/freeverb/CMakeLists.txt b/muse/plugins/freeverb/CMakeLists.txt
index 2ccecfa8..1c69acfc 100644
--- a/muse/plugins/freeverb/CMakeLists.txt
+++ b/muse/plugins/freeverb/CMakeLists.txt
@@ -29,4 +29,4 @@ set_target_properties (freeverb
PROPERTIES PREFIX ""
)
-install_files( /lib/muse-1.0pre1/plugins .so libfreeverb.so)
+install_files( /lib/muse-1.0pre1/plugins .so freeverb.so)
diff --git a/muse/share/html/CMakeLists.txt b/muse/share/html/CMakeLists.txt
index 2c1928ad..b5e2304c 100644
--- a/muse/share/html/CMakeLists.txt
+++ b/muse/share/html/CMakeLists.txt
@@ -18,7 +18,10 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#=============================================================================
-install_files( /share/muse-1.0pre1/html *.html
+#
+# TODO: fill with useful data
+#
+install_files( /share/muse-1.0pre1/html .html
index.html
)