diff options
| author | Flamefire <git@grundis.de> | 2018-12-15 14:11:32 +0100 |
|---|---|---|
| committer | Flamefire <git@grundis.de> | 2018-12-15 17:32:02 +0100 |
| commit | 16b933429a0b101460bdcd32b2b14935e1169c6d (patch) | |
| tree | 870476f38639b2809ea8c60409e0ca2ddcf6610a /utils/vlc_codec | |
| parent | a53f2c21566b213f782fe2e47accdf457f80650a (diff) | |
| download | libADLMIDI-16b933429a0b101460bdcd32b2b14935e1169c6d.tar.gz libADLMIDI-16b933429a0b101460bdcd32b2b14935e1169c6d.tar.bz2 libADLMIDI-16b933429a0b101460bdcd32b2b14935e1169c6d.zip | |
Improve FindLIBVLC
Diffstat (limited to 'utils/vlc_codec')
| -rw-r--r-- | utils/vlc_codec/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | utils/vlc_codec/libadlmidi.c | 2 |
2 files changed, 8 insertions, 18 deletions
diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt index b1f4c02..22e390f 100644 --- a/utils/vlc_codec/CMakeLists.txt +++ b/utils/vlc_codec/CMakeLists.txt @@ -1,32 +1,22 @@ set(CMAKE_C_STANDARD 99) find_package(LIBVLC REQUIRED) -message("Found ${LIBVLCCORE_LIBRARY} of version ${LIBVLC_VERSION} with includes ${LIBVLC_INCLUDE_DIR}") -set(adlmidi_vlc_src) -list(APPEND adlmidi_vlc_src libadlmidi.c) - -add_library(adlmidi_vlc_plugin MODULE ${adlmidi_vlc_src}) +add_library(adlmidi_vlc_plugin MODULE libadlmidi.c) set_target_properties(adlmidi_vlc_plugin PROPERTIES OUTPUT_NAME adlmidi_plugin) -target_compile_options(adlmidi_vlc_plugin PUBLIC - "-DVLC_MODULE_COPYRIGHT=\"Copyright \(c\) Vitaly Novichkov\"" - "-DVLC_MODULE_LICENSE=\"GPLv3\"" - "-DMODULE_STRING=\"adlmidi\"" - ${VLCPLUGIN_DEFINITIONS}) - -target_include_directories(adlmidi_vlc_plugin PRIVATE - ${LIBVLC_INCLUDE_DIR}/vlc/plugins - ${LIBVLC_INCLUDE_DIR}/vlc) +target_compile_definitions(adlmidi_vlc_plugin PUBLIC + "VLC_MODULE_COPYRIGHT=\"Copyright (c) Vitaly Novichkov\"" + "VLC_MODULE_LICENSE=\"GPLv3\"" + "MODULE_STRING=\"adlmidi\"" +) -target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static ${LIBVLCCORE_LIBRARY} m) +target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static libvlc::plugin m) if(WIN32 AND CMAKE_COMPILER_IS_GNUCXX) set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++") set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive") endif() -# target_link_libraries(adlmidi_vlc_plugin INTERFACE "-export-symbol-regex ^vlc_entry") - if(NOT VLC_PLUGIN_NOINSTALL) install(TARGETS adlmidi_vlc_plugin DESTINATION "${VLCPLUGIN_CODEC_INSTALL_PATH}") else() diff --git a/utils/vlc_codec/libadlmidi.c b/utils/vlc_codec/libadlmidi.c index 0440fe5..d3353eb 100644 --- a/utils/vlc_codec/libadlmidi.c +++ b/utils/vlc_codec/libadlmidi.c @@ -22,7 +22,7 @@ #include <vlc_plugin.h> #include <vlc_codec.h> #include <vlc_dialog.h> -#include <libvlc_version.h> +#include <vlc/libvlc_version.h> #include <unistd.h> |