diff --git a/README.md b/README.md index 2fece0f..33f4d60 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,14 @@ Sonivox EAS for Linux and Qt ============================ -This project is a Linux MIDI Synth library based on the Sonivox EAS Synthesizer published by Google on the Android Open Source Project. -It is a real time GM synthesizer without needing external soundfonts, using embedded samples instead. It consumes very little resources, so -it may be indicated in Linux projects for small embedded devices. +This project is a Linux MIDI Synth library based on the Sonivox EAS Synthesizer published by Google on the Android Open Source Project. It is a real time GM synthesizer without needing external soundfonts, using embedded samples instead. It consumes very little resources, so it may be indicated in Linux projects for small embedded devices. ![Screenshot](screenshot.png) A multiplatform alternative fork of this project can be found here: [multiplatform-sonivoxeas](https://github.com/pedrolcl/multiplatform-sonivoxeas). The library uses ALSA Sequencer MIDI input and PulseAudio output. Complete compile-time dependencies are: -* Qt5, http://www.qt.io/ (Qt6 works too, but it is still experimental) +* Qt5/Qt6, http://www.qt.io/ * Drumstick 2, for ALSA MIDI input. http://sourceforge.net/projects/drumstick/ * PulseAudio, for audio output. http://www.freedesktop.org/wiki/Software/PulseAudio/ @@ -57,9 +55,7 @@ https://github.com/pedrolcl/sonivox Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing -permissions and limitations under the License. +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the diff --git a/guisynth/CMakeLists.txt b/guisynth/CMakeLists.txt index d2b2267..5dcccd6 100644 --- a/guisynth/CMakeLists.txt +++ b/guisynth/CMakeLists.txt @@ -32,13 +32,17 @@ target_compile_definitions( guisynth PRIVATE $<$:QT_NO_DEBUG_OUTPUT> ) -install( TARGETS guisynth +install( TARGETS guisynth DESTINATION ${CMAKE_INSTALL_BINDIR} ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps RENAME sonivoxeas.png ) +install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icon.svg + DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps + RENAME sonivoxeas.svg ) + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icon256.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps RENAME sonivoxeas.png ) @@ -48,5 +52,5 @@ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/icon512.png RENAME sonivoxeas.png ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/guisynth.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications + DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME sonivoxeas.desktop ) diff --git a/guisynth/main.cpp b/guisynth/main.cpp index 6144563..976e308 100644 --- a/guisynth/main.cpp +++ b/guisynth/main.cpp @@ -22,15 +22,12 @@ #include #include -#define STRINGIFY(x) #x -#define TOSTRING(x) STRINGIFY(x) - int main(int argc, char *argv[]) { QApplication app(argc, argv); QApplication::setOrganizationName("LinuxEASSynth"); QApplication::setApplicationName("GUISynth"); - QApplication::setApplicationVersion(TOSTRING(VERSION)); + QApplication::setApplicationVersion(QT_STRINGIFY(VERSION)); QApplication::setDesktopFileName("sonivoxeas"); QCommandLineParser parser; parser.setApplicationDescription("GUI MIDI Synthesizer and Player");