Skip to content

Commit 2a6e5f8

Browse files
pedrolclpedrolcl
committed
Merge branch 'devel'
2 parents c61b0ab + d4fc42d commit 2a6e5f8

39 files changed

+13716
-191
lines changed

‎CMakeLists.txt‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1-
cmake_minimum_required(VERSION 3.0)
2-
project(eassynth)
1+
cmake_minimum_required(VERSION 3.9)
2+
project( EASSynth
3+
VERSION 1.3.0
4+
DESCRIPTION "Sonivox EAS for Linux and Qt" )
35

4-
include(CheckCXXCompilerFlag)
5-
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
6-
if(COMPILER_SUPPORTS_CXX11)
7-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
8-
else()
9-
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
10-
endif()
6+
set(CMAKE_CXX_STANDARD 11)
7+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
118

12-
set(VERSION_MAJOR "1")
13-
set(VERSION_MINOR "2")
14-
set(VERSION_PATCH "0")
15-
set(VERSION_SUFFIX "")
16-
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
17-
add_definitions(-DVERSION=${VERSION})
18-
19-
find_package(Qt5Core REQUIRED)
9+
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
10+
find_package(Drumstick 2.0 COMPONENTS ALSA REQUIRED)
2011
find_package(PkgConfig REQUIRED)
12+
pkg_check_modules(PULSE REQUIRED libpulse-simple)
2113

22-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG_OUTPUT")
14+
include(GNUInstallDirs)
2315

2416
add_subdirectory(sonivox)
2517
add_subdirectory(libsvoxeas)

‎EASSynth.pro‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
#------------------------
66

77
TEMPLATE = subdirs
8-
CONFIG += ordered
98
SUBDIRS += sonivox \
109
libsvoxeas \
1110
cmdlnsynth \
1211
guisynth
1312

13+
libsvoxeas.depends = sonivox
14+
cmdlnsynth.depends = libsvoxeas
15+
guisynth.depends = libsvoxeas

‎LICENSE‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,8 @@ the "copyright" line and a pointer to where the full notice is found.
303303
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304304
GNU General Public License for more details.
305305

306-
You should have received a copy of the GNU General Public License along
307-
with this program; if not, write to the Free Software Foundation, Inc.,
308-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
306+
You should have received a copy of the GNU General Public License
307+
along with this program. If not, see <http://www.gnu.org/licenses/>.
309308

310309
Also add information on how to contact you by electronic and paper mail.
311310

‎README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To build, test and debug you may also find QtCreator interesting. You may also u
2525
Licenses
2626
--------
2727

28-
Copyright (C) 2016 Pedro López-Cabanillas.
28+
Copyright (C) 2016-2020 Pedro López-Cabanillas.
2929

3030
This program is free software; you can redistribute it and/or modify
3131
it under the terms of the GNU General Public License as published by
@@ -37,9 +37,8 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
3737
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3838
GNU General Public License for more details.
3939

40-
You should have received a copy of the GNU General Public License along
41-
with this program; if not, write to the Free Software Foundation, Inc.,
42-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
40+
You should have received a copy of the GNU General Public License
41+
along with this program. If not, see <http://www.gnu.org/licenses/>.
4342

4443

4544

‎cmdlnsynth/CMakeLists.txt‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
pkg_check_modules(DRUMSTICK REQUIRED drumstick-alsa)
2-
3-
link_directories(
4-
${DRUMSTICK_LIBRARY_DIRS}
5-
)
6-
7-
include_directories(
8-
${DRUMSTICK_INCLUDE_DIRS}
9-
)
10-
111
add_executable( cmdlnsynth main.cpp )
122

133
target_link_libraries( cmdlnsynth
14-
Qt5::Core
15-
svoxeas
16-
${DRUMSTICK_LIBRARIES}
4+
Qt5::Core
5+
Drumstick::ALSA
6+
svoxeas
177
)
188

9+
target_compile_definitions( cmdlnsynth PRIVATE
10+
VERSION=${PROJECT_VERSION}
11+
$<$<CONFIG:RELEASE>:QT_NO_DEBUG_OUTPUT>
12+
)
1913

2014
install( TARGETS cmdlnsynth
21-
DESTINATION bin )
15+
DESTINATION ${CMAKE_INSTALL_BINDIR} )

‎cmdlnsynth/cmdlnsynth.pro‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,12 @@ LIBS += -lsvoxeas
2020

2121
SOURCES += main.cpp
2222
QMAKE_RPATHDIR = $$OUT_PWD/../libsvoxeas
23-
CONFIG += link_pkgconfig
24-
PKGCONFIG += drumstick-alsa
23+
24+
_DRUMSTICKLIBS=$$(DRUMSTICKLIBS)
25+
isEmpty( _DRUMSTICKLIBS ) {
26+
CONFIG += link_pkgconfig
27+
PKGCONFIG += drumstick-alsa
28+
} else {
29+
INCLUDEPATH += $$(DRUMSTICKINCLUDES)
30+
LIBS += -L$$(DRUMSTICKLIBS) -ldrumstick-alsa
31+
}

‎cmdlnsynth/main.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Sonivox EAS Synthesizer for Qt applications
3-
Copyright (C) 2016-2018, Pedro Lopez-Cabanillas <plcl@users.sf.net>
3+
Copyright (C) 2016-2020, Pedro Lopez-Cabanillas <plcl@users.sf.net>
44
55
This library is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by
@@ -12,9 +12,8 @@
1212
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1313
GNU General Public License for more details.
1414
15-
You should have received a copy of the GNU General Public License along
16-
with this program; if not, write to the Free Software Foundation, Inc.,
17-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
15+
You should have received a copy of the GNU General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>.
1817
*/
1918

2019
#include <signal.h>

‎global.pri‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
VERSION = 1.2.0
1+
VERSION = 1.3.0
22
DEFINES += VERSION=$$VERSION

‎guisynth/CMakeLists.txt‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,30 @@
11
set(CMAKE_INCLUDE_CURRENT_DIR ON)
2-
find_package(Qt5Widgets REQUIRED)
3-
pkg_check_modules(DRUMSTICK REQUIRED drumstick-alsa)
4-
5-
link_directories(
6-
${DRUMSTICK_LIBRARY_DIRS}
7-
)
8-
9-
include_directories(
10-
${DRUMSTICK_INCLUDE_DIRS}
11-
)
12-
13-
set( SOURCES
14-
main.cpp
15-
mainwindow.cpp
16-
)
2+
set(CMAKE_AUTOUIC ON)
3+
set(CMAKE_AUTOMOC ON)
4+
set(CMAKE_AUTORCC ON)
175

6+
set( SOURCES main.cpp mainwindow.cpp )
187
set( HEADERS mainwindow.h )
198
set( FORMS mainwindow.ui )
209
set( RESOURCES guisynth.qrc )
2110

22-
qt5_wrap_cpp ( MOC_SRCS ${HEADERS} )
23-
qt5_wrap_ui ( UI_SRCS ${FORMS} )
24-
qt5_add_resources ( RES_SRCS ${RESOURCES} )
25-
2611
add_executable( guisynth
2712
${SOURCES}
28-
${MOC_SRCS}
29-
${UI_SRCS}
30-
${RES_SRCS}
13+
${HEADERS}
14+
${FORMS}
15+
${RESOURCES}
3116
)
3217

3318
target_link_libraries( guisynth
3419
Qt5::Widgets
20+
Drumstick::ALSA
3521
svoxeas
36-
${DRUMSTICK_LIBRARIES}
22+
)
23+
24+
target_compile_definitions( guisynth PRIVATE
25+
VERSION=${PROJECT_VERSION}
26+
$<$<CONFIG:RELEASE>:QT_NO_DEBUG_OUTPUT>
3727
)
3828

3929
install( TARGETS guisynth
40-
DESTINATION bin )
30+
DESTINATION ${CMAKE_INSTALL_BINDIR} )

‎guisynth/guisynth.pro‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,11 @@ LIBS += -lsvoxeas
3131

3232
QMAKE_RPATHDIR = $$OUT_PWD/../libsvoxeas
3333

34-
CONFIG += link_pkgconfig
35-
PKGCONFIG += drumstick-alsa
34+
_DRUMSTICKLIBS=$$(DRUMSTICKLIBS)
35+
isEmpty( _DRUMSTICKLIBS ) {
36+
CONFIG += link_pkgconfig
37+
PKGCONFIG += drumstick-alsa
38+
} else {
39+
INCLUDEPATH += $$(DRUMSTICKINCLUDES)
40+
LIBS += -L$$(DRUMSTICKLIBS) -ldrumstick-alsa
41+
}

0 commit comments

Comments
 (0)