diff options
| -rw-r--r-- | muse/CMakeLists.txt | 43 | ||||
| -rw-r--r-- | muse/ChangeLog | 2 | ||||
| -rw-r--r-- | muse/awl/CMakeLists.txt | 41 | ||||
| -rw-r--r-- | muse/awl/ltest.cpp | 14 |
4 files changed, 90 insertions, 10 deletions
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index 095f309b..cfde7f08 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -20,6 +20,10 @@ project(muse) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1) + +# set(CMAKE_BUILD_TYPE Debug) +set(CMAKE_BUILD_TYPE Release) + set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) @@ -36,12 +40,15 @@ SET(MusE_INSTALL_NAME "muse-1.0pre1") include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake ) option ( ENABLE_DSSI "enable Disposable Soft Synth Interface" ON) -option ( ENABLE_VST "enable VST/win support" OFF) +option ( ENABLE_VST "enable VST/win support" OFF) option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON) -# set(CMAKE_VERBOSE_MAKEFILE ON) +# for debugging the make system uncomment next line: +set(CMAKE_VERBOSE_MAKEFILE ON) + set(QT_USE_QTXML TRUE) set(QT_USE_QTDESIGNER TRUE) +set(QT_USE_QTNSPLUGIN TRUE) ## ## Just print a notice if this is OS X @@ -181,10 +188,17 @@ add_custom_target(all-pic.h WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) +add_custom_target(all-pic-debug.h + ALL + cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all-pic-debug.h + DEPENDS ${PROJECT_SOURCE_DIR}/all.h + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + ) + add_custom_target(all.h.pch ALL ${CMAKE_CXX_COMPILER} - -g -Wextra -fno-exceptions -fno-rtti -Wall + -g -Wextra -fno-exceptions -Wall -I${QT_INCLUDE_DIR} -I${QT_QTCORE_INCLUDE_DIR} -I${QT_QTGUI_INCLUDE_DIR} @@ -198,7 +212,9 @@ add_custom_target(all-pic.h.pch ALL ${CMAKE_CXX_COMPILER} -fPIC - -g -Wextra -fno-exceptions -fno-rtti -Wall + -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} @@ -207,10 +223,25 @@ add_custom_target(all-pic.h.pch DEPENDS ${PROJECT_BINARY_DIR}/all-pic.h WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) -# add_dependencies(all-pic.h.pch all-pic.h) + +add_custom_target(all-pic-debug.h.pch + ALL + ${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 ${PROJECT_BINARY_DIR}/all-pic-debug.h.pch + ${PROJECT_BINARY_DIR}/all-pic-debug.h + DEPENDS ${PROJECT_BINARY_DIR}/all-pic-debug.h + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + ) set(CMAKE_CXX_FLAGS - "-g -Wall -Wextra -Winvalid-pch -fno-exceptions -fno-rtti" + "-g -Wall -Wextra -Winvalid-pch -fno-exceptions" ) subdirs(al awl grepmidi plugins midiplugins synti muse share doc) diff --git a/muse/ChangeLog b/muse/ChangeLog index 828e69fe..5183d6b6 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,3 +1,5 @@ +14.6. (ws) + * fix build of libawlplugin.so; works for "release" build 12.6. (ws) * drag&drop of wave files with automatic sample rate conversion if necessary diff --git a/muse/awl/CMakeLists.txt b/muse/awl/CMakeLists.txt index 3d8e1499..6af2bc2f 100644 --- a/muse/awl/CMakeLists.txt +++ b/muse/awl/CMakeLists.txt @@ -56,13 +56,46 @@ IF (APPLE) message("Not yet able to build awlplugin under OS X.") ELSE (APPLE) - add_library ( awlplugin SHARED ${awl_src} - awlplugin.cpp ) + # + # build libawlplugin.so + # + QT4_WRAP_CPP (moc_awlplugin_headers + awlplugin.h + volknob.h knob.h aslider.h + slider.h volslider.h mslider.h + posedit.h poslabel.h + tempoedit.h tempolabel.h + combobox.h checkbox.h + panknob.h midipanknob.h + floatentry.h + ) + + add_library ( awlplugin SHARED + awlplugin.cpp + volknob.cpp knob.cpp aslider.cpp + slider.cpp volslider.cpp mslider.cpp + posedit.cpp poslabel.cpp + tempoedit.cpp tempolabel.cpp + combobox.cpp checkbox.cpp + panknob.cpp midipanknob.cpp + floatentry.cpp + ${moc_awlplugin_headers} + ) + set_target_properties( awlplugin - PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h" + PROPERTIES COMPILE_FLAGS + "-D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG -include ${PROJECT_BINARY_DIR}/all-pic.h" + ) + target_link_libraries( awlplugin + al pthread asound ) install_targets ( /lib/${MusE_INSTALL_NAME}/designer/ awlplugin ) -ENDIF (APPLE) + add_executable( ltest ltest.cpp ) + target_link_libraries ( ltest + awlplugin + ${QT_LIBRARIES} + ) +ENDIF (APPLE) diff --git a/muse/awl/ltest.cpp b/muse/awl/ltest.cpp new file mode 100644 index 00000000..340d9a11 --- /dev/null +++ b/muse/awl/ltest.cpp @@ -0,0 +1,14 @@ +#include <stdio.h> +#include "awlplugin.h" + +//--------------------------------------------------------- +// main +//--------------------------------------------------------- + +int main(int argc, char* argv[]) + { + printf("Hello MusE\n"); + new KnobPlugin; + return 0; + } + |