CMake: Added projects for plugins, bundling for OS X

doomsday/apps/plugins/CMakeLists.txt

@@ -7,17 +7,19 @@ include (../../cmake/Config.cmake)
 
 add_subdirectory (example)
 
-# add_subdirectory (idtech1converter)
-# add_subdirectory (savegameconverter)
-# add_subdirectory (dehread)
-#
-# add_subdirectory (doom)
-# add_subdirectory (heretic)
-# add_subdirectory (hexen)
-# add_subdirectory (doom64)
-#
-# add_subdirectory (fmod)
-# add_subdirectory (fluidsynth)
+add_subdirectory (idtech1converter)
+add_subdirectory (savegameconverter)
+add_subdirectory (dehread)
+
+add_subdirectory (doom)
+add_subdirectory (heretic)
+add_subdirectory (hexen)
+add_subdirectory (doom64)
+
+add_subdirectory (fmod)
+if (NOT WIN32)
+    add_subdirectory (fluidsynth)
+endif ()
 # add_subdirectory (openal)
 #
 # # Platform-specific plugins.

doomsday/apps/plugins/PluginConfig.cmake

@@ -6,17 +6,29 @@ project (DENG_PLUGINS)
 include (${CMAKE_CURRENT_LIST_DIR}/../../cmake/Config.cmake)
 
 find_package (DengDoomsday QUIET)
+find_package (LZSS)
 
 macro (deng_add_plugin target)
     sublist (_src 1 -1 ${ARGV})
-    add_library (${target} SHARED ${_src})
-    target_link_libraries (${target} Deng::libdoomsday)
+    add_library (${target} MODULE ${_src} ${DENG_RESOURCES})
+    target_include_directories (${target} PUBLIC ${DENG_API_DIR})
+    target_link_libraries (${target} 
+        PUBLIC Deng::libdoomsday
+        PRIVATE lzss
+    )
     enable_cxx11 (${target})
+    set_target_properties (${target} PROPERTIES FOLDER Plugins)
     if (APPLE)
-        set_property (TARGET ${target} PROPERTY BUNDLE ON)
+        set_target_properties (${target} PROPERTIES 
+            BUNDLE ON
+            MACOSX_BUNDLE_INFO_PLIST ${DENG_SOURCE_DIR}/cmake/MacOSXPluginBundleInfo.plist.in            
+        )
+        set (MACOSX_BUNDLE_BUNDLE_NAME "net.dengine.plugin.${target}")
+        set (MACOSX_BUNDLE_BUNDLE_EXECUTABLE "${target}.bundle/Contents/MacOS/${target}")
+        deng_bundle_resources ()
+    else ()
+        set_target_properties (${target} VERSION ${DENG_VERSION})
     endif ()
-    install (TARGETS ${target} 
-        LIBRARY DESTINATION ${DENG_INSTALL_PLUGIN_DIR}
-    )
+    install (TARGETS ${target} LIBRARY DESTINATION ${DENG_INSTALL_PLUGIN_DIR})
     set (_src)
 endmacro (deng_add_plugin)

doomsday/apps/plugins/common/Common.cmake

@@ -0,0 +1,3 @@
+set (DIR ${CMAKE_CURRENT_LIST_DIR})
+include_directories (${DIR}/include)
+file (GLOB_RECURSE COMMON_SOURCES ${DIR}/src/* ${DIR}/include/*)

doomsday/apps/plugins/dehread/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required (VERSION 3.0)
+project (DENG_DEHREAD)
+include (../PluginConfig.cmake)
+
+include_directories (include)
+file (GLOB SOURCES src/*.cpp include/*.h)
+
+deng_add_plugin (dehread ${SOURCES})

doomsday/apps/plugins/doom/CMakeLists.txt

@@ -0,0 +1,17 @@
+# The Doomsday Engine Project
+# Copyright (c) 2015 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+cmake_minimum_required (VERSION 3.0)
+project (DENG_DOOM)
+set (DENG_ENABLE_PK3S ON) # uses the legacy libdoom.pk3
+include (../PluginConfig.cmake)
+include (../common/Common.cmake)
+
+add_definitions (-D__JDOOM__)
+
+include_directories (include)
+file (GLOB SOURCES src/*.c src/*.cpp include/*.h)
+
+deng_find_resources (libdoom.pk3)
+
+deng_add_plugin (doom ${SOURCES} ${COMMON_SOURCES})

doomsday/apps/plugins/doom64/CMakeLists.txt

@@ -0,0 +1,17 @@
+# The Doomsday Engine Project
+# Copyright (c) 2015 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+cmake_minimum_required (VERSION 3.0)
+project (DENG_DOOM64)
+set (DENG_ENABLE_PK3S ON) # uses the legacy libdoom.pk3
+include (../PluginConfig.cmake)
+include (../common/Common.cmake)
+
+add_definitions (-D__JDOOM64__)
+
+include_directories (include)
+file (GLOB SOURCES src/*.c src/*.cpp include/*.h)
+
+deng_find_resources (libdoom64.pk3)
+
+deng_add_plugin (doom64 ${SOURCES} ${COMMON_SOURCES})

doomsday/apps/plugins/example/CMakeLists.txt

@@ -5,4 +5,6 @@ cmake_minimum_required (VERSION 3.0)
 project (DENG_EXAMPLE)
 include (../PluginConfig.cmake)
 
+include_directories (include)
+
 deng_add_plugin (example src/example.c include/version.h)

doomsday/apps/plugins/fluidsynth/CMakeLists.txt

@@ -0,0 +1,252 @@
+# The Doomsday Engine Project
+# Copyright (c) 2011-2015 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+cmake_minimum_required (VERSION 3.0)
+project (DENG_FLUIDSYNTH)
+include (../PluginConfig.cmake)
+
+find_package (PkgConfig)
+
+set (tgt audio_fluidsynth)
+
+# Make an embedded build by default?
+if (APPLE)
+    set (embed ON)
+elseif (UNIX)
+    set (embed OFF)
+endif ()    
+
+option (DENG_FLUIDSYNTH_EMBEDDED 
+    "Compile FluidSynth as part of the ${tgt} plugin" ${embed}
+)
+
+if (DENG_FLUIDSYNTH_EMBEDDED)
+    find_package (Glib)
+
+    # Bundle library dependencies on OS X.
+    foreach (fn ${GLIB_LIBRARIES})
+        list (APPEND macRes ${fn},Frameworks)
+    endforeach ()    
+    deng_find_resources (${macRes})
+
+    add_definitions (
+        -D_BSD_SOURCE -DFLUIDSYNTH_NOT_A_DLL -DWITH_FLOAT
+        -DHAVE_MATH_H -DHAVE_STDIO_H -DHAVE_STDLIB_H -DHAVE_STRING_H
+    )
+    if (UNIX)
+        add_definitions (
+            -DHAVE_SYS_TYPES_H -DHAVE_SYS_SOCKET_H -DHAVE_SYS_TIME_H
+            -DHAVE_PTHREAD_H -DHAVE_LIMITS_H -DHAVE_UNISTD_H
+            -DHAVE_NETINET_IN_H -DHAVE_NETINET_TCP_H
+            -DHAVE_FCNTL_H -DHAVE_ERRNO_H
+        )
+    endif ()
+    if (APPLE)
+        add_definitions (-DDARWIN)
+    endif ()
+
+    set (FS_DIR ${DENG_EXTERNAL_SOURCE_DIR}/fluidsynth)
+    include_directories (
+        ${FS_DIR}/include
+        ${FS_DIR}/src
+        ${FS_DIR}/src/drivers
+        ${FS_DIR}/src/synth
+        ${FS_DIR}/src/rvoice
+        ${FS_DIR}/src/midi
+        ${FS_DIR}/src/utils
+        ${FS_DIR}/src/sfloader
+        ${FS_DIR}/src/bindings
+    )
+    set (SOURCES
+        ${FS_DIR}/src/utils/fluid_conv.c
+        ${FS_DIR}/src/utils/fluid_hash.c
+        ${FS_DIR}/src/utils/fluid_list.c
+        ${FS_DIR}/src/utils/fluid_ringbuffer.c
+        ${FS_DIR}/src/utils/fluid_settings.c
+        ${FS_DIR}/src/utils/fluid_sys.c
+        ${FS_DIR}/src/sfloader/fluid_defsfont.c
+        ${FS_DIR}/src/sfloader/fluid_ramsfont.c
+        ${FS_DIR}/src/rvoice/fluid_adsr_env.c
+        ${FS_DIR}/src/rvoice/fluid_chorus.c
+        ${FS_DIR}/src/rvoice/fluid_iir_filter.c
+        ${FS_DIR}/src/rvoice/fluid_lfo.c
+        ${FS_DIR}/src/rvoice/fluid_rvoice.c
+        ${FS_DIR}/src/rvoice/fluid_rvoice_dsp.c
+        ${FS_DIR}/src/rvoice/fluid_rvoice_event.c
+        ${FS_DIR}/src/rvoice/fluid_rvoice_mixer.c
+        ${FS_DIR}/src/rvoice/fluid_rev.c
+        ${FS_DIR}/src/synth/fluid_chan.c
+        ${FS_DIR}/src/synth/fluid_event.c
+        ${FS_DIR}/src/synth/fluid_gen.c
+        ${FS_DIR}/src/synth/fluid_mod.c
+        ${FS_DIR}/src/synth/fluid_synth.c
+        ${FS_DIR}/src/synth/fluid_tuning.c
+        ${FS_DIR}/src/synth/fluid_voice.c
+        ${FS_DIR}/src/midi/fluid_midi.c
+        ${FS_DIR}/src/midi/fluid_midi_router.c
+        ${FS_DIR}/src/midi/fluid_seqbind.c
+        ${FS_DIR}/src/midi/fluid_seq.c
+        ${FS_DIR}/src/drivers/fluid_adriver.c
+        ${FS_DIR}/src/drivers/fluid_mdriver.c
+        ${FS_DIR}/src/drivers/fluid_aufile.c
+        ${FS_DIR}/src/bindings/fluid_cmd.c
+        ${FS_DIR}/src/bindings/fluid_filerenderer.c   
+    )
+
+else ()
+    # We will use the libfluidsynth installed on the system.
+    pkg_check_modules (FLUIDSYNTH fluidsynth)
+    if (NOT FLUIDSYNTH_FOUND)
+        message (STATUS "Skipping ${tgt} because libfluidsynth not found (using pkg-config)")
+        return ()
+    endif ()
+
+    add_definitions (-DFLUIDSYNTH_DEFAULT_DRIVER_NAME="pulseaudio")
+endif ()
+
+append (CMAKE_CXX_FLAGS_DEBUG "-DDENG_DSFLUIDSYNTH_DEBUG")
+
+include_directories (include)
+file (GLOB src src/*.cpp include/*.h)
+
+deng_add_plugin (${tgt} ${src} ${SOURCES})
+
+# Additional compiler options.
+if (DENG_FLUIDSYNTH_EMBEDDED)
+    target_link_libraries (${tgt} PRIVATE glib)
+    if (CMAKE_C_COMPILER_ID MATCHES "GNU")
+        target_compile_options (${tgt} PRIVATE
+            -fomit-frame-pointer -funroll-all-loops -finline-functions -fdiagnostics-show-option
+            -Wno-deprecated-declarations
+        )
+    endif ()
+    if (CMAKE_C_COMPILER_ID MATCHES ".*Clang")
+        target_compile_options (${tgt} PRIVATE 
+            -fomit-frame-pointer -finline-functions -fdiagnostics-show-option
+            -Wno-deprecated-declarations -Wno-parentheses -Wno-unused-value
+        )
+    endif ()
+
+    if (APPLE)        
+
+    endif ()
+endif ()
+
+# win32 {
+#     RC_FILE = res/fluidsynth.rc
+#
+#     QMAKE_LFLAGS += /DEF:\"$$PWD/api/dsfluidsynth.def\"
+#     OTHER_FILES += api/dsfluidsynth.def
+# }
+
+# libfluidsynth config ------------------------------------------------------
+
+#
+# FS_DIR = ../../external/fluidsynth
+#
+# INCLUDEPATH += \
+#     $${FS_DIR}/include \
+#     $${FS_DIR}/src \
+#     $${FS_DIR}/src/drivers \
+#     $${FS_DIR}/src/synth \
+#     $${FS_DIR}/src/rvoice \
+#     $${FS_DIR}/src/midi \
+#     $${FS_DIR}/src/utils \
+#     $${FS_DIR}/src/sfloader \
+#     $${FS_DIR}/src/bindings
+#
+# fsh.files = $${FS_DIR}/include/fluidsynth.h
+#
+# headers.files = \
+#     $${FS_DIR}/include/fluidsynth/audio.h \
+#     $${FS_DIR}/include/fluidsynth/event.h \
+#     $${FS_DIR}/include/fluidsynth/gen.h \
+#     $${FS_DIR}/include/fluidsynth/log.h \
+#     $${FS_DIR}/include/fluidsynth/midi.h \
+#     $${FS_DIR}/include/fluidsynth/misc.h \
+#     $${FS_DIR}/include/fluidsynth/mod.h \
+#     $${FS_DIR}/include/fluidsynth/ramsfont.h \
+#     $${FS_DIR}/include/fluidsynth/seq.h \
+#     $${FS_DIR}/include/fluidsynth/seqbind.h \
+#     $${FS_DIR}/include/fluidsynth/settings.h \
+#     $${FS_DIR}/include/fluidsynth/sfont.h \
+#     $${FS_DIR}/include/fluidsynth/shell.h \
+#     $${FS_DIR}/include/fluidsynth/synth.h \
+#     $${FS_DIR}/include/fluidsynth/types.h \
+#     $${FS_DIR}/include/fluidsynth/voice.h \
+#     $${FS_DIR}/include/fluidsynth/version.h
+#
+# HEADERS += $$fsh.files $$headers.files
+#
+# # Internal headers.
+# HEADERS += \
+#     $${FS_DIR}/src/config.h \
+#     $${FS_DIR}/src/utils/fluid_conv.h \
+#     $${FS_DIR}/src/utils/fluid_hash.h \
+#     $${FS_DIR}/src/utils/fluid_list.h \
+#     $${FS_DIR}/src/utils/fluid_ringbuffer.h \
+#     $${FS_DIR}/src/utils/fluid_settings.h \
+#     $${FS_DIR}/src/utils/fluidsynth_priv.h \
+#     $${FS_DIR}/src/utils/fluid_sys.h \
+#     $${FS_DIR}/src/sfloader/fluid_defsfont.h \
+#     $${FS_DIR}/src/sfloader/fluid_ramsfont.h \
+#     $${FS_DIR}/src/sfloader/fluid_sfont.h \
+#     $${FS_DIR}/src/rvoice/fluid_adsr_env.h \
+#     $${FS_DIR}/src/rvoice/fluid_chorus.h \
+#     $${FS_DIR}/src/rvoice/fluid_iir_filter.h \
+#     $${FS_DIR}/src/rvoice/fluid_lfo.h \
+#     $${FS_DIR}/src/rvoice/fluid_rvoice.h \
+#     $${FS_DIR}/src/rvoice/fluid_rvoice_event.h \
+#     $${FS_DIR}/src/rvoice/fluid_rvoice_mixer.h \
+#     $${FS_DIR}/src/rvoice/fluid_phase.h \
+#     $${FS_DIR}/src/rvoice/fluid_rev.h \
+#     $${FS_DIR}/src/synth/fluid_chan.h \
+#     $${FS_DIR}/src/synth/fluid_event_priv.h \
+#     $${FS_DIR}/src/synth/fluid_event_queue.h \
+#     $${FS_DIR}/src/synth/fluid_gen.h \
+#     $${FS_DIR}/src/synth/fluid_mod.h \
+#     $${FS_DIR}/src/synth/fluid_synth.h \
+#     $${FS_DIR}/src/synth/fluid_tuning.h \
+#     $${FS_DIR}/src/synth/fluid_voice.h \
+#     $${FS_DIR}/src/midi/fluid_midi.h \
+#     $${FS_DIR}/src/midi/fluid_midi_router.h \
+#     $${FS_DIR}/src/drivers/fluid_adriver.h \
+#     $${FS_DIR}/src/drivers/fluid_mdriver.h \
+#     $${FS_DIR}/src/bindings/fluid_cmd.h
+#
+# SOURCES += \
+#     $${FS_DIR}/src/utils/fluid_conv.c \
+#     $${FS_DIR}/src/utils/fluid_hash.c \
+#     $${FS_DIR}/src/utils/fluid_list.c \
+#     $${FS_DIR}/src/utils/fluid_ringbuffer.c \
+#     $${FS_DIR}/src/utils/fluid_settings.c \
+#     $${FS_DIR}/src/utils/fluid_sys.c \
+#     $${FS_DIR}/src/sfloader/fluid_defsfont.c \
+#     $${FS_DIR}/src/sfloader/fluid_ramsfont.c \
+#     $${FS_DIR}/src/rvoice/fluid_adsr_env.c \
+#     $${FS_DIR}/src/rvoice/fluid_chorus.c \
+#     $${FS_DIR}/src/rvoice/fluid_iir_filter.c \
+#     $${FS_DIR}/src/rvoice/fluid_lfo.c \
+#     $${FS_DIR}/src/rvoice/fluid_rvoice.c \
+#     $${FS_DIR}/src/rvoice/fluid_rvoice_dsp.c \
+#     $${FS_DIR}/src/rvoice/fluid_rvoice_event.c \
+#     $${FS_DIR}/src/rvoice/fluid_rvoice_mixer.c \
+#     $${FS_DIR}/src/rvoice/fluid_rev.c \
+#     $${FS_DIR}/src/synth/fluid_chan.c \
+#     $${FS_DIR}/src/synth/fluid_event.c \
+#     $${FS_DIR}/src/synth/fluid_gen.c \
+#     $${FS_DIR}/src/synth/fluid_mod.c \
+#     $${FS_DIR}/src/synth/fluid_synth.c \
+#     $${FS_DIR}/src/synth/fluid_tuning.c \
+#     $${FS_DIR}/src/synth/fluid_voice.c \
+#     $${FS_DIR}/src/midi/fluid_midi.c \
+#     $${FS_DIR}/src/midi/fluid_midi_router.c \
+#     $${FS_DIR}/src/midi/fluid_seqbind.c \
+#     $${FS_DIR}/src/midi/fluid_seq.c \
+#     $${FS_DIR}/src/drivers/fluid_adriver.c \
+#     $${FS_DIR}/src/drivers/fluid_mdriver.c \
+#     $${FS_DIR}/src/drivers/fluid_aufile.c \
+#     $${FS_DIR}/src/bindings/fluid_cmd.c \
+#     $${FS_DIR}/src/bindings/fluid_filerenderer.c
+#
+# } # deng_embedfluidsynth