summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/CMakeLists.txt84
-rw-r--r--muse2/ChangeLog4
-rw-r--r--muse2/README41
-rw-r--r--muse2/muse/widgets/filedialog.cpp12
4 files changed, 58 insertions, 83 deletions
diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
index 31e257e5..374ae9c7 100644
--- a/muse2/CMakeLists.txt
+++ b/muse2/CMakeLists.txt
@@ -40,6 +40,19 @@ ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
#set(CMAKE_BUILD_TYPE debug)
#set(CMAKE_BUILD_TYPE release)
+# If no CMAKE_BUILD_TYPE is given on the command line,
+# cmake either uses the cached value, or 'empty' (plain un-opt build).
+# And yet the only way a user can reset a cached CMAKE_BUILD_TYPE
+# is with "-DCMAKE_BUILD_TYPE=". So we cannot interfere with this.
+# We should probably not attempt to do this at all.
+# Installation instructions now updated to be more specific, give options.
+#endif (NOT DEFINED CMAKE_BUILD_TYPE)
+#if (NOT CMAKE_BUILD_TYPE)
+# message("No CMAKE_BUILD_TYPE specified. Setting to Release.")
+# set(CMAKE_BUILD_TYPE release)
+#endif (NOT CMAKE_BUILD_TYPE)
+
+
# for debugging the make system uncomment next line:
# set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -169,24 +182,6 @@ include_directories(${SAMPLERATE_INCLUDE_DIRS})
PKG_CHECK_MODULES(UUID REQUIRED uuid>=0.0.1)
include_directories(${UUID_INCLUDE_DIRS})
-# AC_CHECK_HEADER(uuid/uuid.h, UUID_FOUND="yes", UUID_FOUND="no")
-# if test x$UUID_FOUND = xno; then
-# AC_MSG_ERROR([Header file uuid.h, from the uuid-dev (sometimes in e2fsprogs) package, is required])
-# fi
-#
-# AC_CHECK_LIB(uuid, uuid_generate, UUID_FOUND="yes", UUID_FOUND="no")
-# if test x$UUID_FOUND = xno; then
-# AC_MSG_ERROR([libuuid (sometimes in e2fsprogs package) is required])
-# fi
-# UUID_LIBS="-luuid"
-# AC_SUBST(UUID_CFLAGS)
-# AC_SUBST(UUID_LIBS)
-#
-# ## PKG_CHECK_MODULES(UUID, uuid >= 1.0,
-# ## true,
-# ## AC_MSG_ERROR([need libuuid >= 1.0 from e2fsprogs package])
-# ## )
-
##
## find jack >= 0.103.0
##
@@ -208,39 +203,6 @@ else (ENABLE_LASH)
message("LASH disabled")
endif (ENABLE_LASH)
-# muse_enable_lash="no"
-# AC_ARG_ENABLE(lash,
-# [ --enable-lash enable LASH support],[
-# case "$enableval" in
-# "yes")
-# muse_enable_lash="yes"
-# ;;
-# "no")
-# muse_enable_lash="no"
-# ;;
-# *)
-# AC_MSG_ERROR([must use --enable-lash(=yes/no) or --disable-lash])
-# ;;
-# esac
-# ])
-#
-# if test "$muse_enable_lash" = "yes"; then
-# PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.2, LASH_FOUND="yes", LASH_FOUND="no")
-# AC_SUBST(LASH_CFLAGS)
-# AC_SUBST(LASH_LIBS)
-#
-# if test "$LASH_FOUND" = "yes"; then
-# AC_DEFINE(HAVE_LASH, 1, [whether or not we are supporting lash])
-# LASH_VERSION=$( pkg-config --modversion lash-1.0 )
-# AC_DEFINE_UNQUOTED(LASH_VERSION, "$LASH_VERSION", [The version of lash we're compiling against])
-# fi
-# else
-# AC_MSG_WARN([LASH support is disabled])
-# LASH_FOUND="no"
-# fi
-# AM_CONDITIONAL(HAVE_LASH, test "$LASH_FOUND" = "yes")
-
-
##
## check for liblo >= 0.23
##
@@ -289,17 +251,6 @@ SET (USE_SSE false)
## check for fluidsynth
##
-if (ENABLE_LASH)
- PKG_CHECK_MODULES(LASH lash-1.0>=0.2)
- if (LASH_FOUND)
- include_directories(${LASH_INCLUDE_DIRS})
- set(HAVE_LASH ON)
- endif (LASH_FOUND)
-else (ENABLE_LASH)
- message("LASH disabled")
-endif (ENABLE_LASH)
-
-
if ( ENABLE_FLUID )
# Be careful with naming here since we have two shared synth libraries
# to be built later, named 'fluidsynth' and 'fluid' !
@@ -423,3 +374,12 @@ summary_add("DSSI support" DSSI_SUPPORT)
summary_add("VST support" VST_SUPPORT)
summary_add("Fluidsynth support" HAVE_FLUIDSYNTH)
summary_show()
+
+# Make the user aware of what type they're building.
+if (NOT CMAKE_BUILD_TYPE)
+ message(" Build type: CMAKE_BUILD_TYPE is empty. Plain un-optimized build.")
+else (NOT CMAKE_BUILD_TYPE)
+ message(" Build type: " ${CMAKE_BUILD_TYPE} )
+endif (NOT CMAKE_BUILD_TYPE)
+message("")
+
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 27a35b8c..c6ceaf78 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,7 @@
+18.11.2010
+ - Updated build part README file - read it! Tell user to specify Release build type. (Tim)
+ - Added printout of build type in top level cmake. (Tim)
+ - Removed duplicate LASH detection in top level cmake. (Tim)
17.11.2010
- Removed a fix which cured graphic corruption for me in MusE-1. Not required now. (Tim)
- Small change to Orcan's filedialog, re-enabled global button. (Tim)
diff --git a/muse2/README b/muse2/README
index b0e19086..e032cc6e 100644
--- a/muse2/README
+++ b/muse2/README
@@ -57,25 +57,36 @@ details.
Compiling:
=============================
- - download source from http://lmuse.sourceforge.net/
+ - Download source from http://lmuse.sourceforge.net/
- - command line to unpack source:
- tar xvofz muse-x.y.z.tar.gz </code>
- where x.y.z is the version number.
+ - Command line to unpack source:
+ tar xvofz muse-x.y.z.tar.gz
+ where x.y.z is the version number.
+ Or just use a graphical de-compressor to unpack it somewhere.
- - to compile MusE, run the following commands from the
- top level directory, where the source code was unpacked :
+ - To compile MusE, run the following commands from the
+ top level directory where the source code was unpacked
+ (the directory where THIS README FILE is):
- mkdir build # create build directory
- cd build # enter build directory
+ # Create build directory. Choose any name like 'build'.
+ mkdir build
+ # Enter build directory.
+ cd build
+
+ # Create make system in the build directory.
+ # Optional <Prefix> is the location to install MusE, default /usr/local.
+ # Build type can be blank (to reset a previous cached type to 'empty'),
+ # debug, release, RelWithDebInfo and MinSizeRel.
+ # If no CMAKE_BUILD_TYPE is given at all, cmake uses either the previous
+ # cached value, or else 'empty' (plain unoptimized).
+ # ('Release' type is recommended, otherwise it builds a plain unoptimized program.)
+ cmake -DCMAKE_BUILD_TYPE=release [-DCMAKE_INSTALL_PREFIX=<prefix>] ../
+
+ # Compile muse
+ make
- cmake [-DCMAKE_INSTALL_PREFIX=<prefix> ] ../ # create make system in build directory
- # prefix is desired location to install MusE, default /usr/local
-
- make # compile muse
-
- - install MusE:
- run "make install" (as root user)
+ - Install MusE:
+ Run "make install" (as root user)
=============================
running MusE
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index c86a507e..cd4fff91 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -172,13 +172,13 @@ MFileDialog::MFileDialog(const QString& dir,
// Qt >= 4.6 allows us to select icons from the theme
#if QT_VERSION >= 0x040600
- buttons.globalButton->setIcon(QIcon::fromTheme("folder", QIcon(":/icons/global.xpm")));
- buttons.userButton->setIcon(QIcon::fromTheme("user-home", QIcon(":/icons/user.xpm")));
- buttons.projectButton->setIcon(QIcon::fromTheme("folder-sound", QIcon(":/icons/project.xpm")));
+ buttons.globalButton->setIcon(QIcon::fromTheme("folder", style()->standardIcon(QStyle::SP_DirIcon)));
+ buttons.userButton->setIcon(QIcon::fromTheme("user-home", style()->standardIcon(QStyle::SP_DirHomeIcon)));
+ buttons.projectButton->setIcon(QIcon::fromTheme("folder-sound", style()->standardIcon(QStyle::SP_DirOpenIcon)));
#else
- buttons.globalButton->setIcon(QIcon(":/icons/global.xpm"));
- buttons.userButton->setIcon(QIcon(":/icons/user.xpm"));
- buttons.projectButton->setIcon(QIcon(":/icons/project.xpm"));
+ buttons.globalButton->setIcon(style()->standardIcon(QStyle::SP_DirIcon));
+ buttons.userButton->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
+ buttons.projectButton->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
#endif
connect(buttons.globalButton, SIGNAL(toggled(bool)), this, SLOT(globalToggled(bool)));
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 05:55:17 +0000