Merge pull request #198 from Flamefire/Cmake_Cleanup

CMake cleanup

5 files changed, 8 insertions, 81 deletions

diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt
index 1f37890..22e390f 100644
--- a/utils/vlc_codec/CMakeLists.txt
+++ b/utils/vlc_codec/CMakeLists.txt
@@ -1,35 +1,22 @@
 set(CMAKE_C_STANDARD 99)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../cmake")
 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")
-elseif(NOT WIN32)
-    target_link_libraries(adlmidi_vlc_plugin PRIVATE stdc++)
 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/Makefile.am b/utils/vlc_codec/Makefile.am
deleted file mode 100644
index 8992451..0000000
--- a/utils/vlc_codec/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-lib_LTLIBRARIES = libadlmidi_plugin.la
-
-CFLAGS = -DVLC_MODULE_COPYRIGHT="\"Copyright \(c\) Vitaly Novichkov\""
-CFLAGS += -DVLC_MODULE_LICENSE=\"GPLv3\"
-
-libadlmidi_plugin_la_SOURCES = libadlmidi.c
-libadlmidi_plugin_la_CFLAGS = -DMODULE_STRING=\"adlmidi\" $(vlc_CFLAGS)
-libadlmidi_plugin_la_CPPFLAGS = -DMODULE_STRING=\"adlmidi\" $(vlc_CFLAGS)
-libadlmidi_plugin_la_LIBADD = $(vlc_LIBS)
-libadlmidi_plugin_la_LDFLAGS = -avoid-version -module -export-symbol-regex ^vlc_entry -lADLMIDI -lm -lstdc++ $(vlc_LDFLAGS)
-
diff --git a/utils/vlc_codec/autogen.sh b/utils/vlc_codec/autogen.sh
deleted file mode 100755
index 57eeb94..0000000
--- a/utils/vlc_codec/autogen.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ -x "`which autoreconf 2>/dev/null`" ] ; then
-   exec autoreconf -ivf
-fi
-
-LIBTOOLIZE=libtoolize
-SYSNAME=`uname`
-if [ "x$SYSNAME" = "xDarwin" ] ; then
-  LIBTOOLIZE=glibtoolize
-fi
-aclocal -I m4 && \
-	autoheader && \
-	$LIBTOOLIZE && \
-	autoconf && \
-	automake --add-missing --force-missing --copy
diff --git a/utils/vlc_codec/configure.ac b/utils/vlc_codec/configure.ac
deleted file mode 100644
index 3afee7a..0000000
--- a/utils/vlc_codec/configure.ac
+++ /dev/null
@@ -1,32 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.68])
-AC_INIT([vlc-libadlmidi], [1.0.0], [admin@wohlnet.ru])
-AC_CONFIG_SRCDIR([libadlmidi.c])
-AC_CONFIG_MACRO_DIR([m4])
-AC_USE_SYSTEM_EXTENSIONS
-LT_INIT
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CC_C99
-AC_PROG_INSTALL
-AC_PROG_LN_S
-PKG_PROG_PKG_CONFIG
-
-# Initialize automake stuff
-AM_INIT_AUTOMAKE([foreign])
-
-AC_C_INLINE
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_STRNLEN
-AC_SEARCH_LIBS([sqrt], [m])
-AC_CHECK_FUNCS([memset sqrt strcasecmp strcspn strdup strndup strstr strtol])
-
-PKG_CHECK_MODULES([vlc], [vlc-plugin >= 2.0])
-PKG_CHECK_MODULES([vlc212], [vlc-plugin >= 2.1])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-
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>