From c998feb631ae9b51d5cf92ce43f685fa63811ef7 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 13:12:35 +0100 Subject: Remove explicit link to stdc++ --- utils/adlmidi-2/CMakeLists.txt | 2 +- utils/gen_adldata/CMakeLists.txt | 2 +- utils/midiplay/CMakeLists.txt | 2 +- utils/vlc_codec/CMakeLists.txt | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) (limited to 'utils') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index ee081c6..3965c42 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -50,7 +50,7 @@ elseif(NOT ADLMIDI_DOS) if(NOT OPENBSD_LOCALBASE) target_link_libraries(adlmidi2 PRIVATE dl) endif() - target_link_libraries(adlmidi2 PRIVATE pthread m stdc++) + target_link_libraries(adlmidi2 PRIVATE pthread m) endif() if(NOT WITH_CPP_EXTRAS) diff --git a/utils/gen_adldata/CMakeLists.txt b/utils/gen_adldata/CMakeLists.txt index 40aa4b5..56662e7 100644 --- a/utils/gen_adldata/CMakeLists.txt +++ b/utils/gen_adldata/CMakeLists.txt @@ -48,7 +48,7 @@ if(MSVC) message("Turned on C++11 on MSVC") target_compile_options(gen_adldata PUBLIC "/std:c++latest") else() - target_link_libraries(gen_adldata PRIVATE pthread m stdc++) + target_link_libraries(gen_adldata PRIVATE pthread m) endif() if(WITH_GENADLDATA_COMMENTS) diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index 4f0c411..3531090 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -30,7 +30,7 @@ elseif(NOT ADLMIDI_DOS) if(NOT OPENBSD_LOCALBASE) target_link_libraries(adlmidiplay PRIVATE dl) endif() - target_link_libraries(adlmidiplay PRIVATE pthread m stdc++) + target_link_libraries(adlmidiplay PRIVATE pthread m) endif() if(ADLMIDI_DOS) diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt index 1f37890..59f89fd 100644 --- a/utils/vlc_codec/CMakeLists.txt +++ b/utils/vlc_codec/CMakeLists.txt @@ -24,8 +24,6 @@ target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static ${LIBVLCCORE_LIB 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") -- cgit v1.2.3 From a53f2c21566b213f782fe2e47accdf457f80650a Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 13:21:41 +0100 Subject: Set toplevel CMAKE_MODULE_PATH --- utils/vlc_codec/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'utils') diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt index 59f89fd..b1f4c02 100644 --- a/utils/vlc_codec/CMakeLists.txt +++ b/utils/vlc_codec/CMakeLists.txt @@ -1,6 +1,5 @@ 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}") -- cgit v1.2.3 From 16b933429a0b101460bdcd32b2b14935e1169c6d Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 14:11:32 +0100 Subject: Improve FindLIBVLC --- utils/vlc_codec/CMakeLists.txt | 24 +++++++----------------- utils/vlc_codec/libadlmidi.c | 2 +- 2 files changed, 8 insertions(+), 18 deletions(-) (limited to 'utils') 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 #include #include -#include +#include #include -- cgit v1.2.3 From 040f57ad6ecc488c58aca559dc675cdd6be50f18 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 17:58:41 +0100 Subject: Remove makefiles --- utils/midiplay/Makefile | 12 ------------ utils/midiplay/Makefile.win32 | 12 ------------ utils/vlc_codec/Makefile.am | 13 ------------- utils/vlc_codec/autogen.sh | 15 --------------- utils/vlc_codec/configure.ac | 32 -------------------------------- 5 files changed, 84 deletions(-) delete mode 100644 utils/midiplay/Makefile delete mode 100644 utils/midiplay/Makefile.win32 delete mode 100644 utils/vlc_codec/Makefile.am delete mode 100755 utils/vlc_codec/autogen.sh delete mode 100644 utils/vlc_codec/configure.ac (limited to 'utils') diff --git a/utils/midiplay/Makefile b/utils/midiplay/Makefile deleted file mode 100644 index f2512b4..0000000 --- a/utils/midiplay/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -all: midiplay - -midiplay: adlmidiplay.o wave_writer.o - g++ $^ -Wl,-rpath='$$ORIGIN' -L../../bin -ladlmidi -lSDL2 -o ../../bin/adlmidiplay - rm *.o - -adlmidiplay.o: adlmidiplay.cpp - g++ -c $^ -I.. -o adlmidiplay.o - -wave_writer.o: wave_writer.c - gcc -c $^ -I.. -o wave_writer.o - diff --git a/utils/midiplay/Makefile.win32 b/utils/midiplay/Makefile.win32 deleted file mode 100644 index 05e192f..0000000 --- a/utils/midiplay/Makefile.win32 +++ /dev/null @@ -1,12 +0,0 @@ -all: midiplay - -midiplay: adlmidiplay.o wave_writer.o - g++ $^ -L../../bin -ladlmidi -lSDL2 -o ../../bin/adlmidiplay - rm *.o - -adlmidiplay.o: adlmidiplay.cpp - g++ -c $^ -I.. -o adlmidiplay.o - -wave_writer.o: wave_writer.c - gcc -c $^ -I.. -o wave_writer.o - 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 - -- cgit v1.2.3 From 5fa2ceaf2968dccaa8c0825c6d3498bd173055ef Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 17:59:43 +0100 Subject: Remove pro files --- utils/adlmidi-2/adlmidi-2.pro | 62 --------------------------------------- utils/gen_adldata/gen_adldata.pro | 39 ------------------------ 2 files changed, 101 deletions(-) delete mode 100644 utils/adlmidi-2/adlmidi-2.pro delete mode 100644 utils/gen_adldata/gen_adldata.pro (limited to 'utils') diff --git a/utils/adlmidi-2/adlmidi-2.pro b/utils/adlmidi-2/adlmidi-2.pro deleted file mode 100644 index 8808504..0000000 --- a/utils/adlmidi-2/adlmidi-2.pro +++ /dev/null @@ -1,62 +0,0 @@ -TEMPLATE=app -CONFIG-=qt -CONFIG+=console - -CONFIG -= c++11 - -TARGET = adlmidi2 -DESTDIR=$$PWD/../../bin/ - -#INCLUDEPATH += $$PWD/AudioCodecs/build/install/include -#LIBS += -L$$PWD/AudioCodecs/build/install/lib -INCLUDEPATH += $$PWD/../../src $$PWD/../../include -#LIBS += -Wl,-Bstatic -lSDL2 -Wl,-Bdynamic -lpthread -ldl -LIBS += -lSDL2 -lpthread -ldl - -linux-*: { - QMAKE_CXXFLAGS += -fopenmp - QMAKE_LFLAGS += -fopenmp -} - -#DEFINES += DEBUG_TIME_CALCULATION -#DEFINES += DEBUG_SEEKING_TEST -#DEFINES += DISABLE_EMBEDDED_BANKS -#DEFINES += ADLMIDI_USE_DOSBOX_OPL -#DEFINES += ENABLE_BEGIN_SILENCE_SKIPPING - -QMAKE_CFLAGS += -std=c90 -pedantic -QMAKE_CXXFLAGS += -std=c++98 -pedantic - -HEADERS += \ - $$PWD/../../include/adlmidi.h \ - $$PWD/../../include/adlmidi.hpp \ - $$PWD/../../src/adlbank.h \ - $$PWD/../../src/adldata.hh \ - $$PWD/../../src/adlmidi_mus2mid.h \ - $$PWD/../../src/adlmidi_private.hpp \ - $$PWD/../../src/adlmidi_xmi2mid.h \ - $$PWD/../../src/fraction.h \ - $$PWD/../../src/nukedopl3.h \ - $$PWD/../../src/dbopl.h \ - $$PWD/../../src/midiplay/wave_writer.h \ - 6x9.hpp \ - 8x16.hpp \ - 9x15.hpp \ - puzzlegame.hpp - -SOURCES += \ - $$PWD/../../src/adldata.cpp \ - \ - $$PWD/../../src/adlmidi.cpp \ - $$PWD/../../src/adlmidi_load.cpp \ - $$PWD/../../src/adlmidi_midiplay.cpp \ - $$PWD/../../src/adlmidi_mus2mid.c \ - $$PWD/../../src/adlmidi_opl3.cpp \ - $$PWD/../../src/adlmidi_private.cpp \ - $$PWD/../../src/adlmidi_xmi2mid.c \ - $$PWD/../../src/nukedopl3.c \ - $$PWD/../../src/dbopl.cpp \ - \ - midiplay.cc \ - puzzlegame.cc - diff --git a/utils/gen_adldata/gen_adldata.pro b/utils/gen_adldata/gen_adldata.pro deleted file mode 100644 index 7f42c5c..0000000 --- a/utils/gen_adldata/gen_adldata.pro +++ /dev/null @@ -1,39 +0,0 @@ -TEMPLATE=app -CONFIG-=qt -CONFIG+=console -TARGET=gen_adldata -DESTDIR=$$PWD/../../bin -CONFIG += c++11 - -include($$PWD/ini/IniProcessor.pri) - -#DEFINES += ADLMIDI_USE_DOSBOX_OPL - -QMAKE_CXXFLAGS_RELEASE += -O3 -finline-functions -LIBS += -lpthread - -HEADERS += \ - midi_inst_list.h \ - ../nukedopl3.h \ - ../dbopl.h \ - progs_cache.h \ - file_formats/load_bnk.h \ - file_formats/load_bnk2.h \ - file_formats/load_op2.h \ - file_formats/load_ail.h \ - file_formats/load_ibk.h \ - file_formats/load_jv.h \ - file_formats/load_tmb.h \ - file_formats/load_bisqwit.h \ - file_formats/load_wopl.h \ - measurer.h \ - file_formats/common.h \ - file_formats/load_ea.h - -SOURCES += \ - gen_adldata.cc \ - ../nukedopl3.c \ - ../dbopl.cpp \ - progs_cache.cpp \ - measurer.cpp - -- cgit v1.2.3 From 16d2602e043eeb2398bb3be9bb4498228f221be1 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sun, 16 Dec 2018 14:43:07 +0100 Subject: Use target_* functions --- utils/xmi2mid/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'utils') diff --git a/utils/xmi2mid/CMakeLists.txt b/utils/xmi2mid/CMakeLists.txt index f4a7c94..38dba77 100644 --- a/utils/xmi2mid/CMakeLists.txt +++ b/utils/xmi2mid/CMakeLists.txt @@ -1,4 +1,6 @@ add_executable(xmi2mid xmi2mid.cpp) +# TODO: Use own library +target_include_directories(xmi2mid PRIVATE ${PROJECT_SOURCE_DIR}/src) install(TARGETS xmi2mid RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -- cgit v1.2.3