summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xMakefile70
-rw-r--r--muse/CMakeLists.txt68
-rw-r--r--muse/al/CMakeLists.txt4
-rw-r--r--muse/midiplugins/libmidiplugin/CMakeLists.txt2
-rw-r--r--muse/muse/CMakeLists.txt3
-rw-r--r--muse/muse/arranger/CMakeLists.txt6
-rw-r--r--muse/muse/ctrl/CMakeLists.txt27
-rw-r--r--muse/muse/ctrl/ctrledit.cpp2
-rw-r--r--muse/muse/ctrl/ctrledit.h2
-rw-r--r--muse/muse/driver/CMakeLists.txt6
-rw-r--r--muse/muse/instruments/CMakeLists.txt12
-rw-r--r--muse/muse/liste/CMakeLists.txt2
-rw-r--r--muse/muse/marker/CMakeLists.txt2
-rw-r--r--muse/muse/master/CMakeLists.txt2
-rw-r--r--muse/muse/midiedit/CMakeLists.txt6
-rw-r--r--muse/muse/midiseq.cpp2
-rw-r--r--muse/muse/mixer/CMakeLists.txt6
-rw-r--r--muse/muse/waveedit/CMakeLists.txt4
-rw-r--r--muse/pch.txt2
-rw-r--r--muse/synti/deicsonze/CMakeLists.txt12
-rw-r--r--muse/synti/libsynti/CMakeLists.txt5
-rw-r--r--muse/synti/organ/CMakeLists.txt2
-rw-r--r--muse/synti/zynaddsubfx/CMakeLists.txt2
23 files changed, 114 insertions, 135 deletions
diff --git a/Makefile b/Makefile
index 2efc7f23..c80965f9 100755
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Linux Music Editor
# $Id:$
#
-# Copyright (C) 2002-2006 by Werner Schweer and others
+# Copyright (C) 2002-2008 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.
@@ -18,22 +18,35 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#=============================================================================
-default:
- if test ! -d build; \
+CPUS = `grep -c processor /proc/cpuinfo`
+PREFIX = "/usr/local"
+VERSION = "muse-2.0.0"
+
+release:
+ if test ! -d build; \
then \
- echo "+creating build directory"; \
mkdir build; \
- echo "+entering build directory"; \
cd build; \
- echo "+calling cmake" ; \
- cmake ../muse ; \
+ cmake -DCMAKE_BUILD_TYPE=RELEASE \
+ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+ ../muse; \
+ make -j ${CPUS}; \
else \
- echo "+entering build directory"; \
- cd build; \
- fi; \
- echo "+start top level make..."; \
- make -f Makefile
+ echo "build directory does already exist, please remove first with 'make clean'"; \
+ fi;
+debug:
+ if test ! -d build; \
+ then \
+ mkdir build; \
+ cd build; \
+ cmake -DCMAKE_BUILD_TYPE=DEBUG \
+ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+ ../muse; \
+ make -j ${CPUS}; \
+ else \
+ echo "build directory does already exist, please remove first with 'make clean'"; \
+ fi
#
# clean out of source build
@@ -43,37 +56,32 @@ clean:
-rm -rf build
#
-# create source distribution
+# dist
+# create source distribution
+# - get current version from sourceforge
+# - remove .svn directories
+# - tar
#
dist:
- cd build; make package_source
- mv build/muse-*.tar.gz .
+ -rm -rf muse.dist
+ mkdir muse.dist
+ cd muse.dist; svn co https://lmuse.svn.sourceforge.net/svnroot/muse/trunk ${VERSION}
+ cd muse.dist; find . -name .svn -print0 | xargs -0 /bin/rm -rf
+ cd muse.dist; tar cvfj ${VERSION}.tar.bz2 ${VERSION}
+ mv muse.dist/${VERSION}.tar.bz2 .
install:
cd build; make install
#
# this creates a shell archive / installer for
-# MusE binary
+# Mscore binary
#
package:
cd build; make package
- mv build/muse-*.sh .
-
-
-# build muse/doc/man/de/man-de.pdf
-# and muse/doc/man/en/man-en.pdf
-manual:
- cd build; make manual
-
-# build muse/doc/dimple/dimpl.pdf
-program_doc:
- cd build; make program_doc
-
-# build doxygen program documentation
-doxy:
- cd build; make doxy
+man:
+ cd build; make man
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index 53897063..9a1e5ce0 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -27,7 +27,7 @@ if (NOT CMAKE_INSTALL_LIBDIR)
endif (NOT CMAKE_INSTALL_LIBDIR)
#set(CMAKE_BUILD_TYPE debug)
-set(CMAKE_BUILD_TYPE release)
+#set(CMAKE_BUILD_TYPE release)
# for debugging the make system uncomment next line:
# set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -51,10 +51,10 @@ SET(MusE_INSTALL_NAME "muse-2.0")
include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake )
include ( ${PROJECT_SOURCE_DIR}/cmake/TargetDoc.cmake)
-option ( ENABLE_DSSI "enable Disposable Soft Synth Interface" OFF)
-option ( ENABLE_VST "enable VST/win support" OFF)
-option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON)
-option ( ENABLE_ZYNADDSUBFX "enable zyaddsubfx softsynth plugin" ON)
+option ( ENABLE_DSSI "enable Disposable Soft Synth Interface" OFF)
+option ( ENABLE_VST "enable VST/win support" OFF)
+option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON)
+option ( ENABLE_ZYNADDSUBFX "enable zyaddsubfx softsynth plugin" ON)
##
## Just print a notice if this is OS X
@@ -125,15 +125,16 @@ endif (APPLE)
## mxml
## fltk + fluid
##
-## problems with FLTK:
+## problems with FLTK/CMake:
## - fltk is not found on kubuntu/ubuntu
## - cmake version > 2.4 crashes
## - there is an annoying (and wrong) usage message from cmake concerning FLTK
##
if (ENABLE_ZYNADDSUBFX)
-## set (FLTK_INCLUDE_DIR "/usr/include")
-## set(FLTK_FLUID_EXECUTABLE "/usr/fluid")
+ # HACK:
+ #set (FLTK_INCLUDE_DIR "/usr/include")
+ #set(FLTK_FLUID_EXECUTABLE "/usr/bin/fluid")
include (FindFLTK)
if (NOT FLTK_FOUND)
@@ -151,7 +152,7 @@ if (ENABLE_ZYNADDSUBFX)
message("mxml found.")
endif (NOT MXML_INCDIR)
#
- # TODO: check for fftw3 library
+ # check for fftw3 library
#
PKGCONFIG (fftw3 3.1.2 FFTW_INCDIR FFTW_LIBDIR FFTW_LIB FFTW_CPP )
if (NOT FFTW_INCDIR)
@@ -271,53 +272,18 @@ add_custom_command(
)
add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
- COMMAND ${CMAKE_CXX_COMPILER}
- -g -Wextra -fno-exceptions -Wall
- -I${QT_INCLUDE_DIR}
- -I${QT_QTCORE_INCLUDE_DIR}
- -I${QT_QTGUI_INCLUDE_DIR}
- -o all.h.pch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-
-add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all-pic.h.pch
- COMMAND ${CMAKE_CXX_COMPILER}
- -fPIC
- -Dawlplugin_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DQT_XML_LIB
- -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG
- -g -Wextra -fno-exceptions -Wall
- -I${QT_INCLUDE_DIR}
- -I${QT_QTCORE_INCLUDE_DIR}
- -I${QT_QTGUI_INCLUDE_DIR}
- -o all-pic.h.pch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
+ OUTPUT ${PROJECT_BINARY_DIR}/all-pic.h
+ COMMAND cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all-pic.h
+ DEPENDS ${PROJECT_SOURCE_DIR}/all.h
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all-pic-debug.h.pch
- COMMAND ${CMAKE_CXX_COMPILER}
- -fPIC
- -Dawlplugin_debug_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DQT_XML_LIB
- -DQT_PLUGIN -DQT_SHARED -DQT_DEBUG
- -g -Wextra -fno-exceptions -Wall
- -I${QT_INCLUDE_DIR}
- -I${QT_QTCORE_INCLUDE_DIR}
- -I${QT_QTGUI_INCLUDE_DIR}
- -o all-pic-debug.h.pch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
+ OUTPUT ${PROJECT_BINARY_DIR}/all-pic-debug.h
+ COMMAND cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all-pic-debug.h
+ DEPENDS ${PROJECT_SOURCE_DIR}/all.h
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
-set_source_files_properties(
- ${PROJECT_BINARY_DIR}/all.h
- ${PROJECT_BINARY_DIR}/all.h.pch
- ${PROJECT_BINARY_DIR}/all-pic.h.pch
- ${PROJECT_BINARY_DIR}/all-pic-debug.h.pch
- PROPERTIES generated true
- )
include_directories(
.
@@ -338,6 +304,8 @@ include_directories(
${DSSI_INCDIR}
)
+# include (pch.txt)
+
#
# If the cmake version includes cpack, use it
#
diff --git a/muse/al/CMakeLists.txt b/muse/al/CMakeLists.txt
index 7af5f9c5..ef819f5c 100644
--- a/muse/al/CMakeLists.txt
+++ b/muse/al/CMakeLists.txt
@@ -23,12 +23,10 @@ set_source_files_properties(
al.cpp marker.cpp pos.cpp sig.cpp tempo.cpp xml.cpp
dsp.cpp
dspXMM.cpp
- PROPERTIES COMPILE_FLAGS "-fPIC -include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-fPIC -include ${PROJECT_BINARY_DIR}/all.h"
)
set_source_files_properties( dspSSE.cpp
PROPERTIES COMPILE_FLAGS "-x assembler"
)
-add_dependencies(al ${PROJECT_SOURCE_DIR}/all.h.pch)
-
diff --git a/muse/midiplugins/libmidiplugin/CMakeLists.txt b/muse/midiplugins/libmidiplugin/CMakeLists.txt
index b530bdca..5988205f 100644
--- a/muse/midiplugins/libmidiplugin/CMakeLists.txt
+++ b/muse/midiplugins/libmidiplugin/CMakeLists.txt
@@ -21,6 +21,6 @@
add_library ( midiplugin mempi.cpp )
set_target_properties( midiplugin
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt
index a2279624..64479c1a 100644
--- a/muse/muse/CMakeLists.txt
+++ b/muse/muse/CMakeLists.txt
@@ -179,7 +179,6 @@ set_target_properties( muse
)
target_link_libraries(muse
- ctrl
midiedit
master
driver
@@ -191,9 +190,9 @@ target_link_libraries(muse
mixer
waveedit
widgets
- ctrl
al
awl
+ ctrl
${QT_LIBRARIES}
QtSvg
${ALSA_LIB}
diff --git a/muse/muse/arranger/CMakeLists.txt b/muse/muse/arranger/CMakeLists.txt
index 812c26aa..b58f6114 100644
--- a/muse/muse/arranger/CMakeLists.txt
+++ b/muse/muse/arranger/CMakeLists.txt
@@ -30,13 +30,13 @@ QT4_WRAP_CPP ( arranger_mocs
trackinfo.h
)
-QT4_WRAP_UI ( arranger_ui_headers
+QT4_WRAP_UI ( arranger_ui_headers
configtrack.ui
midiportinfo.ui
miditrackinfo.ui
)
-add_library ( arranger STATIC
+add_library ( arranger STATIC
${arranger_ui_headers}
${arranger_mocs}
selectfilter.h
@@ -55,6 +55,6 @@ add_library ( arranger STATIC
)
set_target_properties( arranger
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/ctrl/CMakeLists.txt b/muse/muse/ctrl/CMakeLists.txt
index e9e10702..0bdb5be6 100644
--- a/muse/muse/ctrl/CMakeLists.txt
+++ b/muse/muse/ctrl/CMakeLists.txt
@@ -18,32 +18,29 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#=============================================================================
-QT4_WRAP_CPP (ctrl_mocs
- configmidictrl.h
- definemidictrl.h
+QT4_WRAP_CPP (ctrl_mocs
+ configmidictrl.h
+ definemidictrl.h
ctrldialog.h
ctrledit.h
)
-QT4_WRAP_UI (ctrl_ui_headers
- configmidictrl.ui
- definemidictrl.ui
+
+QT4_WRAP_UI (ctrl_ui_headers
+ configmidictrl.ui
+ definemidictrl.ui
ctrldialog.ui
)
-add_library ( ctrl STATIC
- configmidictrl.cpp
- definemidictrl.cpp
+add_library ( ctrl STATIC
+ configmidictrl.cpp
+ definemidictrl.cpp
ctrldialog.cpp
- ctrldialog.h
ctrleditor.cpp
- configmidictrl.h
- definemidictrl.h
- ctrleditor.h
ctrledit.cpp
${ctrl_mocs}
${ctrl_ui_headers}
)
set_target_properties( ctrl
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
- )
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+ )
diff --git a/muse/muse/ctrl/ctrledit.cpp b/muse/muse/ctrl/ctrledit.cpp
index cbd0275c..20022f47 100644
--- a/muse/muse/ctrl/ctrledit.cpp
+++ b/muse/muse/ctrl/ctrledit.cpp
@@ -91,7 +91,7 @@ void CtrlEdit::setCtrl(int id)
}
else
_ctrl = _track->getController(id);
-
+
if (!_ctrl)
printf("CtrlEdit::setCtrl(%d): not found for track <%s>\n", id,
_track->name().toLocal8Bit().data());
diff --git a/muse/muse/ctrl/ctrledit.h b/muse/muse/ctrl/ctrledit.h
index c5904ff5..d942c84f 100644
--- a/muse/muse/ctrl/ctrledit.h
+++ b/muse/muse/ctrl/ctrledit.h
@@ -21,7 +21,7 @@
#ifndef __CTRL_EDIT_H__
#define __CTRL_EDIT_H__
-#include "ctrl/ctrleditor.h"
+#include "ctrleditor.h"
#include "gui.h"
class SimpleButton;
diff --git a/muse/muse/driver/CMakeLists.txt b/muse/muse/driver/CMakeLists.txt
index 094ea1d3..3b337481 100644
--- a/muse/muse/driver/CMakeLists.txt
+++ b/muse/muse/driver/CMakeLists.txt
@@ -4,11 +4,11 @@
#
IF (APPLE)
-set ( driver_src
+set ( driver_src
jack.cpp dummyaudio.cpp coretimer.cpp coremidi.cpp
)
ELSE (APPLE)
-set ( driver_src
+set ( driver_src
alsamidi.cpp jack.cpp dummyaudio.cpp alsatimer.cpp
rtctimer.cpp posixtimer.cpp
)
@@ -16,6 +16,6 @@ ENDIF (APPLE)
add_library ( driver STATIC ${driver_src} )
set_target_properties( driver
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/instruments/CMakeLists.txt b/muse/muse/instruments/CMakeLists.txt
index 4aa0b60d..b86764d4 100644
--- a/muse/muse/instruments/CMakeLists.txt
+++ b/muse/muse/instruments/CMakeLists.txt
@@ -22,20 +22,20 @@ QT4_WRAP_CPP ( instruments_mocs
minstrument.h editinstrument.h
)
-QT4_WRAP_UI ( instruments_ui_headers
- editinstrument.ui
+QT4_WRAP_UI ( instruments_ui_headers
+ editinstrument.ui
)
-add_library ( instruments STATIC
- minstrument.cpp
+add_library ( instruments STATIC
+ minstrument.cpp
editinstrument.cpp
- minstrument.h
+ minstrument.h
editinstrument.h
${instruments_mocs}
${instruments_ui_headers}
)
set_target_properties( instruments
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/liste/CMakeLists.txt b/muse/muse/liste/CMakeLists.txt
index 3727383a..988efaf8 100644
--- a/muse/muse/liste/CMakeLists.txt
+++ b/muse/muse/liste/CMakeLists.txt
@@ -42,7 +42,7 @@ add_library ( liste STATIC
${liste_ui_headers}
)
set_target_properties( liste
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/marker/CMakeLists.txt b/muse/muse/marker/CMakeLists.txt
index 1af7d878..d031533c 100644
--- a/muse/muse/marker/CMakeLists.txt
+++ b/muse/muse/marker/CMakeLists.txt
@@ -40,6 +40,6 @@ set ( marker_src ${mocCPP} ${moc_headers})
add_library ( marker STATIC ${marker_src})
set_target_properties( marker
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/master/CMakeLists.txt b/muse/muse/master/CMakeLists.txt
index 6b34bb7f..a20d3be1 100644
--- a/muse/muse/master/CMakeLists.txt
+++ b/muse/muse/master/CMakeLists.txt
@@ -32,6 +32,6 @@ set ( master_src ${mocCPP} ${moc_headers})
add_library ( master STATIC ${master_src})
set_target_properties( master
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/midiedit/CMakeLists.txt b/muse/muse/midiedit/CMakeLists.txt
index 00fc169f..a71aed71 100644
--- a/muse/muse/midiedit/CMakeLists.txt
+++ b/muse/muse/midiedit/CMakeLists.txt
@@ -33,14 +33,14 @@ QT4_WRAP_CPP ( midiedit_mocs
trackpattern.h
)
-QT4_WRAP_UI ( midiedit_ui_headers
+QT4_WRAP_UI ( midiedit_ui_headers
midicmd.ui
gatetime.ui
velocity.ui
quantconfig.ui
)
-add_library ( midiedit STATIC
+add_library ( midiedit STATIC
midicmd.h
gatetime.h
${midiedit_ui_headers}
@@ -66,6 +66,6 @@ add_library ( midiedit STATIC
)
set_target_properties( midiedit
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/midiseq.cpp b/muse/muse/midiseq.cpp
index bfb03283..8714257c 100644
--- a/muse/muse/midiseq.cpp
+++ b/muse/muse/midiseq.cpp
@@ -212,7 +212,7 @@ void MidiSeq::midiTick(void* p, void*)
// schedule all events upto curFrame()
//
unsigned curFrame = audioDriver->frameTime();
- iMidiOutEvent i = at->playEvents.begin();
+ iMidiOutEvent i = at->playEvents.begin();
for (; i != at->playEvents.end(); ++i) {
if (i->event.time() > curFrame)
break;
diff --git a/muse/muse/mixer/CMakeLists.txt b/muse/muse/mixer/CMakeLists.txt
index 35e088cf..dfd05391 100644
--- a/muse/muse/mixer/CMakeLists.txt
+++ b/muse/muse/mixer/CMakeLists.txt
@@ -28,11 +28,11 @@ QT4_WRAP_CPP ( mixer_mocs
strip.h
)
-QT4_WRAP_UI ( mixer_ui_headers
+QT4_WRAP_UI ( mixer_ui_headers
routedialog.ui
)
-add_library ( mixer STATIC
+add_library ( mixer STATIC
${mixer_ui_headers}
${mixer_mocs}
astrip.cpp
@@ -45,5 +45,5 @@ add_library ( mixer STATIC
)
set_target_properties( mixer
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/muse/waveedit/CMakeLists.txt b/muse/muse/waveedit/CMakeLists.txt
index fac8101b..69ff19e3 100644
--- a/muse/muse/waveedit/CMakeLists.txt
+++ b/muse/muse/waveedit/CMakeLists.txt
@@ -23,12 +23,12 @@ QT4_WRAP_CPP ( waveedit_mocs
waveview.h
)
-add_library ( waveedit STATIC
+add_library ( waveedit STATIC
${waveedit_mocs}
waveedit.cpp
waveview.cpp
)
set_target_properties( waveedit
- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
)
diff --git a/muse/pch.txt b/muse/pch.txt
index 433041bd..11e9ab5f 100644
--- a/muse/pch.txt
+++ b/muse/pch.txt
@@ -54,7 +54,7 @@ add_custom_command(
-I${QT_INCLUDE_DIR}
-I${QT_QTCORE_INCLUDE_DIR}
-I${QT_QTGUI_INCLUDE_DIR}
- -o all-pic.h.pch all.h
+ -o all-pic.h.pch all-pic.h
DEPENDS ${PROJECT_BINARY_DIR}/all-pic.h
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
diff --git a/muse/synti/deicsonze/CMakeLists.txt b/muse/synti/deicsonze/CMakeLists.txt
index 6f0d0e4e..bbb1f13b 100644
--- a/muse/synti/deicsonze/CMakeLists.txt
+++ b/muse/synti/deicsonze/CMakeLists.txt
@@ -18,26 +18,32 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#=============================================================================
+include(${PROJECT_SOURCE_DIR}/pch.txt)
+
QT4_WRAP_CPP ( deicsonze_mocs deicsonzegui.h )
QT4_WRAP_UI ( deicsonze_uis deicsonzegui.ui )
-add_library ( deicsonze SHARED
+add_library ( deicsonze SHARED
+ ${PROJECT_BINARY_DIR}/all.h
+ ${PROJECT_BINARY_DIR}/all-pic.h.pch
deicsonze.cpp
deicsonzepreset.cpp
deicsonzeplugin.cpp
deicsonzefilter.cpp
deicsonzegui.cpp
deicsonzegui.h
+
${deicsonze_mocs}
${deicsonze_uis}
)
+
target_link_libraries( deicsonze synti )
-# - tell cmake to name target deicsonze.so instead of
+# - tell cmake to name target deicsonze.so instead of
# libdeicsonze.so
# - use precompiled header files
#
-set_target_properties ( deicsonze
+set_target_properties ( deicsonze
PROPERTIES PREFIX ""
#COMPILE_FLAGS "-O2 -include ${PROJECT_BINARY_DIR}/all-pic.h"
COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
diff --git a/muse/synti/libsynti/CMakeLists.txt b/muse/synti/libsynti/CMakeLists.txt
index e3aeb72d..c30048dc 100644
--- a/muse/synti/libsynti/CMakeLists.txt
+++ b/muse/synti/libsynti/CMakeLists.txt
@@ -18,7 +18,10 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#=============================================================================
+include(${PROJECT_SOURCE_DIR}/pch.txt)
+
add_library(synti
+ ${PROJECT_BINARY_DIR}/all-pic.h.pch
mess.cpp
mess2.cpp
gui.cpp
@@ -31,6 +34,6 @@ add_library(synti
# -fPIC is necessary for 64 bit systems
#
set_target_properties( synti
- PROPERTIES COMPILE_FLAGS "-fPIC -include ${PROJECT_SOURCE_DIR}/all.h"
+ PROPERTIES COMPILE_FLAGS "-fPIC -include ${PROJECT_BINARY_DIR}/all-pic.h"
)
diff --git a/muse/synti/organ/CMakeLists.txt b/muse/synti/organ/CMakeLists.txt
index e7613984..01540c88 100644
--- a/muse/synti/organ/CMakeLists.txt
+++ b/muse/synti/organ/CMakeLists.txt
@@ -37,7 +37,7 @@ add_library ( organ SHARED
#
set_target_properties ( organ
PROPERTIES PREFIX ""
- COMPILE_FLAGS "-O6 -include ${PROJECT_BINARY_DIR}/all-pic.h"
+ COMPILE_FLAGS "-O2 -include ${PROJECT_BINARY_DIR}/all-pic.h"
)
target_link_libraries(organ
diff --git a/muse/synti/zynaddsubfx/CMakeLists.txt b/muse/synti/zynaddsubfx/CMakeLists.txt
index 79cf5f8d..d8461cd4 100644
--- a/muse/synti/zynaddsubfx/CMakeLists.txt
+++ b/muse/synti/zynaddsubfx/CMakeLists.txt
@@ -78,7 +78,7 @@ add_library (
set_target_properties ( zynaddsubfx
PROPERTIES PREFIX ""
- COMPILE_FLAGS "-O6 -fvisibility=hidden -DASM_F2I_YES -DOS_LINUX -DFFTW_VERSION_3"
+ COMPILE_FLAGS "-O2 -fvisibility=hidden -DASM_F2I_YES -DOS_LINUX -DFFTW_VERSION_3"
)
target_link_libraries( zynaddsubfx
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 14:16:12 +0000