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/midiplay | |
| 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/midiplay')
| -rw-r--r-- | utils/midiplay/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/midiplay/Makefile | 12 | ||||
| -rw-r--r-- | utils/midiplay/Makefile.win32 | 12 |
3 files changed, 1 insertions, 25 deletions
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/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 - |