commit 072c6c0c6626e82f4fab8e9b34b77cea4740b596
parent e036a74f0c363ae6b9ecf17c6615c47cdca0e191
Author: Harald Hvaal <haraldhv@stud.ntnu.no>
Date: Mon, 1 Jun 2009 22:53:28 +0900
Updating cmake files to correctly compile the old UI
Diffstat:
5 files changed, 138 insertions(+), 0 deletions(-)
diff --git a/cmake/FindMYFLTK.cmake b/cmake/FindMYFLTK.cmake
@@ -0,0 +1,49 @@
+# The CMake supplied FindFLTK delivers FLTK_LIBRARIES as a full list of
+# static and shared libs, with full paths. We really want just a list of
+# the lib names. This slight perversion defines
+# MYFLTK_FOUND true or false
+# MYFLTK_CONFIG fltk-config executable
+# FLTK_FLUID_EXECUTABLE fluid executable
+# MYFLTK_LDFLAGS a list of libs required for linking
+#
+
+if (MYFLTK_LDFLAGS)
+ # in cache already
+ set(MYFLTK_FOUND TRUE)
+else (MYFLTK_LDFLAGS)
+ find_program (MYFLTK_CONFIG fltk-config)
+ if (MYFLTK_CONFIG)
+ execute_process (COMMAND ${MYFLTK_CONFIG} --ldflags OUTPUT_VARIABLE MYFLTK_LDFLAGS)
+ message("MYFLTK_LDFLAGS: ${MYFLTK_LDFLAGS}")
+ string(STRIP ${MYFLTK_LDFLAGS} MYFLTK_LIBS)
+ message("MYFLTK_LIBS: ${MYFLTK_LIBS}")
+ string(REPLACE "-l" "" MYFLTK_LIBS ${MYFLTK_LIBS})
+ message("MYFLTK_LIBS: ${MYFLTK_LIBS}")
+ string(REPLACE " " "; " MYFLTK_LIBS ${MYFLTK_LIBS})
+ message("MYFLTK_LINK_LIBS: ${MYFLTK_LINK_LIBS}")
+ #list(APPEND MYFLTK_LIBS ${MYFLTK_LINK_LIBS})
+ message("MYFLTK_LIBS: ${MYFLTK_LIBS}")
+ find_program (FLTK_FLUID_EXECUTABLE fluid)
+ if (FLTK_FLUID_EXECUTABLE)
+# mark_as_advanced(MYFLTK_CONFIG)
+# mark_as_advanced(FLTK_EXECUTABLE)
+# mark_as_advanced(MYFLTK_LIBRARIES)
+ set(MYFLTK_FOUND TRUE)
+ set(FLTK_WRAP_UI 1)
+ endif(FLTK_FLUID_EXECUTABLE)
+ endif (MYFLTK_CONFIG)
+endif (MYFLTK_LDFLAGS)
+
+# message("MYFLTK_LDFLAGS: ${MYFLTK_LDFLAGS}")
+# message("FLTK_WRAP_UI: ${FLTK_WRAP_UI}")
+
+if (MYFLTK_FOUND)
+ if (NOT MYFLTK_FIND_QUIETLY)
+ message(STATUS "found ${MYFLTK_CONFIG}")
+ # message(STATUS "found ${FLTK_FLUID_EXECUTABLE}")
+ endif (NOT MYFLTK_FIND_QUIETLY)
+else (MYFLTK_FOUND)
+ if (MYFLTK_FIND_REQUIRED)
+ message(FATAL_ERROR "could not find MYFLTK, aborting.")
+ endif (MYFLTK_FIND_REQUIRED)
+endif (MYFLTK_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
#in CMakeCache.txt
SET (FFTW_VERSION 3 CACHE STRING "Version number of FFTW")
SET (OutputModule jack CACHE STRING "Output module, either alsa, jack or portaudio")
+set (WANT_FLTK ON)
if (OutputModule STREQUAL alsa)
@@ -45,20 +46,49 @@ add_definitions(-DFFTW_VERSION_${FFTW_VERSION}
)
+ if(WANT_FLTK) # Check for FLTK
+ find_package(FLTK REQUIRED)
+ # message(STATUS "FLTK_LIBRARIES: ${FLTK_LIBRARIES}")
+ # message("FLTK_MATH_LIBRARY: ${FLTK_MATH_LIBRARY}")
+ # message("FLTK_LIBRARIES: ${FLTK_LIBRARIES}")
+
+ mark_as_advanced(FORCE FLTK_BASE_LIBRARY)
+ mark_as_advanced(FORCE FLTK_CONFIG_SCRIPT)
+ mark_as_advanced(FORCE FLTK_DIR)
+ mark_as_advanced(FORCE FLTK_FLUID_EXECUTABLE)
+ mark_as_advanced(FORCE FLTK_FORMS_LIBRARY)
+ mark_as_advanced(FORCE FLTK_GL_LIBRARY)
+ mark_as_advanced(FORCE FLTK_IMAGES_LIBRARY)
+ mark_as_advanced(FORCE FLTK_INCLUDE_DIR)
+ mark_as_advanced(FORCE FLTK_MATH_LIBRARY)
+
+ set(FLTK_LIBRARIES
+ ${FLTK_BASE_LIBRARY} ${FLTK_MATH_LIBRARY} ${FLTK_FORMS_LIBRARY}
+ ${FLTK_IMAGES_LIBRARY} ${FLTK_GL_LIBRARY}
+ )
+ add_definitions(-DWANT_GUI)
+ message(STATUS "will build gui")
+endif()
+
+
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/NewUI
${CMAKE_CURRENT_SOURCE_DIR}/NewUI)
add_subdirectory(Misc)
add_subdirectory(Input)
add_subdirectory(Output)
+add_subdirectory(Controls)
#add_subdirectory(NewUI)
add_subdirectory(Synth)
add_subdirectory(Seq)
add_subdirectory(Effects)
add_subdirectory(Params)
add_subdirectory(DSP)
+add_subdirectory(UI)
+add_subdirectory(Samples)
set(zynaddsubfxgui_SRCS
#main.cpp
@@ -78,5 +108,8 @@ target_link_libraries(zynaddsubfxgui
zynaddsubfxgui_effect
zynaddsubfxgui_params
zynaddsubfxgui_dsp
+ zynaddsubfxgui_samples
+ zynaddsubfxgui_controls
+ ${FLTK_LIBRARIES}
zynaddsubfxguilib)
diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(zynaddsubfxgui_controls_SRCS
+ Control.C
+ DelayCtl.C
+)
+
+add_library(zynaddsubfxgui_controls STATIC
+ ${zynaddsubfxgui_controls_SRCS}
+ )
diff --git a/src/Samples/CMakeLists.txt b/src/Samples/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(zynaddsubfxgui_samples_SRCS
+ AuSample.C
+ FqSample.C
+ Sample.C
+ #StereoSample.C
+)
+
+add_library(zynaddsubfxgui_samples STATIC
+ ${zynaddsubfxgui_samples_SRCS}
+ )
+
+target_link_libraries(zynaddsubfxgui_samples
+ zynaddsubfxgui_samples
+ )
diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+set(UI_cpp_files GuiThread.cpp PARENT_SCOPE)
+
+set(UI_fl_files
+ ADnoteUI.fl
+ BankUI.fl
+ ConfigUI.fl
+ EffUI.fl
+ EnvelopeUI.fl
+ FilterUI.fl
+ LFOUI.fl
+ MasterUI.fl
+ MicrotonalUI.fl
+ OscilGenUI.fl
+ PADnoteUI.fl
+ PartUI.fl
+ PresetsUI.fl
+ ResonanceUI.fl
+ SeqUI.fl
+ SUBnoteUI.fl
+ VirKeyboard.fl
+ WidgetPDial.fl
+)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set_source_files_properties(UI/MasterUI.h PROPERTIES GENERATED 1)
+fltk_wrap_ui(zynaddsubfxguilib ${UI_fl_files})
+
+add_library(zynaddsubfxguilib STATIC
+ ${UI_objs}
+ ${zynaddsubfxguilib_FLTK_UI_SRCS}
+ )
+target_link_libraries(zynaddsubfxguilib)
