diff options
| author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-12-16 22:20:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 22:20:48 +0300 |
| commit | 657c48c65cb312e6513a21696bec589cad03aa01 (patch) | |
| tree | 199ba745257368269416fe8416f9f41b834cb2da /utils/adlmidi-2 | |
| parent | 7babcc0b2c91ace40a74154790f4e9f461e91c59 (diff) | |
| parent | 16d2602e043eeb2398bb3be9bb4498228f221be1 (diff) | |
| download | libADLMIDI-657c48c65cb312e6513a21696bec589cad03aa01.tar.gz libADLMIDI-657c48c65cb312e6513a21696bec589cad03aa01.tar.bz2 libADLMIDI-657c48c65cb312e6513a21696bec589cad03aa01.zip | |
Merge pull request #198 from Flamefire/Cmake_Cleanup
CMake cleanup
Diffstat (limited to 'utils/adlmidi-2')
| -rw-r--r-- | utils/adlmidi-2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/adlmidi-2/adlmidi-2.pro | 62 |
2 files changed, 1 insertions, 63 deletions
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/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 - |