Revision 110:125520c3dc05

View differences:

.hgignore
39 39
svapp
40 40
checker
41 41
piper
42
piper-cpp
42
piper-vamp-cpp
43 43
dataquay
44 44
bqvec
45 45
bqfft
......
51 51
piper-vamp-simple-server
52 52
piper-convert
53 53
.repoint*
54
glob:.repoint*
acinclude.m4
261 261
  fi
262 262
])
263 263

  
264
# ===========================================================================
265
#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
266
# ===========================================================================
267
#
268
# SYNOPSIS
269
#
270
#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
271
#
272
# DESCRIPTION
273
#
274
#   Check whether the given FLAG works with the current language's compiler
275
#   or gives an error.  (Warnings, however, are ignored)
276
#
277
#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
278
#   success/failure.
279
#
280
#   If EXTRA-FLAGS is defined, it is added to the current language's default
281
#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
282
#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
283
#   force the compiler to issue an error when a bad flag is given.
284
#
285
#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
286
#
287
#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
288
#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
289
#
290
# LICENSE
291
#
292
#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
293
#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
294
#
295
#   Copying and distribution of this file, with or without modification, are
296
#   permitted in any medium without royalty provided the copyright notice
297
#   and this notice are preserved.  This file is offered as-is, without any
298
#   warranty.
299

  
300
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
301
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
302
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
303
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
304
  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
305
  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
306
  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
307
    [AS_VAR_SET(CACHEVAR,[yes])],
308
    [AS_VAR_SET(CACHEVAR,[no])])
309
  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
310
AS_VAR_IF(CACHEVAR,yes,
311
  [m4_default([$2], :)],
312
  [m4_default([$3], :)])
313
AS_VAR_POPDEF([CACHEVAR])dnl
314
])dnl AX_CHECK_COMPILE_FLAGS
315

  
base.pri
7 7
	bqresample \
8 8
	bqaudioio \
9 9
	bqaudioio/bqaudioio \
10
	piper-cpp \
10
	bqaudiostream \
11
	bqaudiostream/bqaudiostream \
12
	bqthingfactory \
13
	piper-vamp-cpp \
11 14
	checker \
12 15
	checker/checker \
13 16
	dataquay \
......
31 34
# Defines for Dataquay
32 35
DEFINES += USE_SORD
33 36

  
34
CONFIG += qt thread warn_on stl rtti exceptions c++11
37
CONFIG += qt thread warn_on stl rtti exceptions
base.pro
20 20
OBJECTS_DIR = o
21 21
MOC_DIR = o
22 22

  
23
exists(repoint.pri) {
24
    include(repoint.pri)
25
}
26

  
23 27
include(bq-files.pri)
24 28
include(vamp-plugin-sdk-files.pri)
25 29
include(svcore/files.pri)
......
31 35
CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES)
32 36
CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS)
33 37
                 
34
CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/qt/test.pro, HEADERS)
38
CLIENT_HEADERS=$$fromfile(piper-vamp-cpp/vamp-client/qt/test.pro, HEADERS)
35 39

  
36 40
for (file, BQ_SOURCES)       { SOURCES += $$file }
37 41
for (file, BQ_HEADERS)       { HEADERS += $$file }
......
49 53
for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
50 54
             
51 55
for (file, CLIENT_HEADERS) {
52
    HEADERS += $$sprintf("piper-cpp/vamp-client/qt/%1",  $$file)
56
    HEADERS += $$sprintf("piper-vamp-cpp/vamp-client/qt/%1",  $$file)
53 57
}
54 58

  
55
SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp
59
SOURCES += piper-vamp-cpp/vamp-capnp/piper-capnp.cpp
56 60

  
bq-files.pri
23 23
	bqaudioio/src/JACKAudioIO.h \
24 24
	bqaudioio/src/Log.h \
25 25
	bqaudioio/src/PortAudioIO.h \
26
	bqaudioio/src/PulseAudioIO.h
26
	bqaudioio/src/PulseAudioIO.h \
27
        bqaudiostream/bqaudiostream/AudioReadStream.h \
28
        bqaudiostream/bqaudiostream/AudioReadStreamFactory.h \
29
        bqaudiostream/bqaudiostream/Exceptions.h \
30
        bqthingfactory/bqthingfactory/ThingFactory.h
27 31

  
28 32
BQ_SOURCES += \
29 33
	bqvec/src/Allocators.cpp \
......
38 42
	bqaudioio/src/PulseAudioIO.cpp \
39 43
	bqaudioio/src/ResamplerWrapper.cpp \
40 44
	bqaudioio/src/SystemPlaybackTarget.cpp \
41
	bqaudioio/src/SystemRecordSource.cpp
45
	bqaudioio/src/SystemRecordSource.cpp \
46
        bqaudiostream/src/AudioReadStream.cpp \
47
        bqaudiostream/src/AudioReadStreamFactory.cpp \
48
        bqaudiostream/src/AudioStreamExceptions.cpp
42 49

  
capnp-regen.pri
1 1

  
2
capnpc.target = piper-cpp/vamp-capnp/piper.capnp.h
2
capnpc.target = piper-vamp-cpp/vamp-capnp/piper.capnp.h
3 3
capnpc.depends = $$PWD/piper/capnp/piper.capnp
4 4

  
5
capnpc.commands = capnp compile --src-prefix=$$PWD/piper/capnp -oc++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
5
capnpc.commands = capnp compile --src-prefix=$$PWD/piper/capnp -oc++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
6 6

  
7 7
macx* {
8
    capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
8
    capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
9 9
}
10 10

  
11 11
win32-g++ {
12
    capnpc.commands=$$PWD/sv-dependency-builds/win32-mingw/bin/capnp -I$$PWD/sv-dependency-builds/win32-mingw/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win32-mingw/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
12
    capnpc.commands=$$PWD/sv-dependency-builds/win32-mingw/bin/capnp -I$$PWD/sv-dependency-builds/win32-mingw/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win32-mingw/bin/capnpc-c++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
13 13
}
14 14

  
15 15
win32-msvc* {
......
24 24
    # I hope using the relative path as target should fix it without
25 25
    # breaking the VC2015 build.
26 26

  
27
    capnpc.target = ../$$basename(PWD)/piper-cpp/vamp-capnp/piper.capnp.h
28
    capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
27
    capnpc.target = ../$$basename(PWD)/piper-vamp-cpp/vamp-capnp/piper.capnp.h
28
    capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
29 29
}
30 30

  
31 31
QMAKE_EXTRA_TARGETS += capnpc
config.pri.in
1 1

  
2 2
CONFIG += @QMAKE_CONFIG@
3 3

  
4
PREFIX_PATH = @prefix@
5

  
4 6
DEFINES += @HAVES@
5 7

  
6 8
QMAKE_CC = @CC@
......
11 13
QMAKE_CXXFLAGS += @CXXFLAGS@
12 14
QMAKE_LFLAGS += @LDFLAGS@
13 15

  
16
CONFIG += @CXXSTANDARD@
17

  
14 18
linux*:LIBS += -L$$PWD -lbase -lasound -ldl
15 19

  
16 20
macx*:DEFINES += HAVE_COREAUDIO
......
18 22

  
19 23
LIBS += @LIBS@
20 24

  
21
DEFINES += HAVE_PIPER HAVE_PLUGIN_CHECKER_HELPER
25
linux*:LIBS -= -ljack
22 26

  
27
DEFINES += HAVE_PIPER HAVE_PLUGIN_CHECKER_HELPER DYNAMIC_JACK
28

  
configure
624 624
LIBOBJS
625 625
QMAKE_CONFIG
626 626
HAVES
627
CXXFLAGS_MINIMAL
627
CXXSTANDARD
628 628
CUT
629 629
SHA1SUM
630 630
MAKEDEPEND
......
632 632
PERL
633 633
X11_LIBS
634 634
X11_CFLAGS
635
opus_LIBS
636
opus_CFLAGS
635 637
id3tag_LIBS
636 638
id3tag_CFLAGS
637 639
mad_LIBS
......
784 786
mad_LIBS
785 787
id3tag_CFLAGS
786 788
id3tag_LIBS
789
opus_CFLAGS
790
opus_LIBS
787 791
X11_CFLAGS
788 792
X11_LIBS'
789 793

  
......
1464 1468
  id3tag_CFLAGS
1465 1469
              C compiler flags for id3tag, overriding pkg-config
1466 1470
  id3tag_LIBS linker flags for id3tag, overriding pkg-config
1471
  opus_CFLAGS C compiler flags for opus, overriding pkg-config
1472
  opus_LIBS   linker flags for opus, overriding pkg-config
1467 1473
  X11_CFLAGS  C compiler flags for X11, overriding pkg-config
1468 1474
  X11_LIBS    linker flags for X11, overriding pkg-config
1469 1475

  
......
4411 4417

  
4412 4418

  
4413 4419
SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING"
4414
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING"
4415
SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE"
4420
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING -DNO_HIT_COUNTS"
4416 4421

  
4417 4422
# Now we have: USER_CXXFLAGS contains any flags the user set
4418 4423
# explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought
......
4420 4425
# allow ourselves to be overridden (later) by the former
4421 4426

  
4422 4427
CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
4428
OPTFLAGS_DEBUG="-O2"
4429
LDFLAGS_DEBUG=""
4423 4430
CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
4424
CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
4431
OPTFLAGS_RELEASE="-O2"
4432
LDFLAGS_RELEASE=""
4433
CXXSTANDARD=c++14
4425 4434

  
4426 4435
if test "x$GCC" = "xyes"; then
4427
   	CXXFLAGS_ANY="-std=c++11 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
4436
   	CXXFLAGS_ANY="-fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
4428 4437
        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
4429
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
4430
   	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
4431
fi
4432

  
4433
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
4438
        OPTFLAGS_DEBUG="-O2"
4439
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0"
4440
        OPTFLAGS_RELEASE="-O3 -ffast-math"
4441
        LIBS_DEBUG="$LIBS"
4442
        as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__--std=$CXXSTANDARD" | $as_tr_sh`
4443
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts --std=$CXXSTANDARD" >&5
4444
$as_echo_n "checking whether C++ compiler accepts --std=$CXXSTANDARD... " >&6; }
4445
if eval \${$as_CACHEVAR+:} false; then :
4446
  $as_echo_n "(cached) " >&6
4447
else
4448

  
4449
  ax_check_save_flags=$CXXFLAGS
4450
  CXXFLAGS="$CXXFLAGS  --std=$CXXSTANDARD"
4451
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4452
/* end confdefs.h.  */
4453

  
4454
int
4455
main ()
4456
{
4457

  
4458
  ;
4459
  return 0;
4460
}
4461
_ACEOF
4462
if ac_fn_cxx_try_compile "$LINENO"; then :
4463
  eval "$as_CACHEVAR=yes"
4464
else
4465
  eval "$as_CACHEVAR=no"
4466
fi
4467
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4468
  CXXFLAGS=$ax_check_save_flags
4469
fi
4470
eval ac_res=\$$as_CACHEVAR
4471
	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
4472
$as_echo "$ac_res" >&6; }
4473
if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
4474
  :
4475
else
4476
  { $as_echo "$as_me:${as_lineno-$LINENO}: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&5
4477
$as_echo "$as_me: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&6;}
4478
        CXXSTANDARD=c++11
4479
fi
4480

  
4481
fi
4482

  
4483
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE $OPTFLAGS_RELEASE"
4484
LDFLAGS_BUILD="$LDFLAGS_RELEASE $OPTFLAGS_RELEASE"
4434 4485
SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
4435 4486

  
4436 4487
QMAKE_CONFIG="release"
......
4440 4491
  enableval=$enable_debug; { $as_echo "$as_me:${as_lineno-$LINENO}: enabling debug build" >&5
4441 4492
$as_echo "$as_me: enabling debug build" >&6;}
4442 4493
QMAKE_CONFIG="debug"
4443
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG"
4494
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG $OPTFLAGS_DEBUG"
4495
LDFLAGS_BUILD="$LDFLAGS_DEBUG"
4444 4496
SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"
4497
LIBS="$LIBS_DEBUG"
4445 4498
fi
4446 4499

  
4447 4500

  
......
4451 4504
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Overriding default compiler flags with the above user setting." >&5
4452 4505
$as_echo "$as_me: Overriding default compiler flags with the above user setting." >&6;}
4453 4506
	CXXFLAGS_BUILD="$USER_CXXFLAGS"
4454
	CXXFLAGS_MINIMAL="$USER_CXXFLAGS"
4507
        LDFLAGS_BUILD=""
4455 4508
fi
4456 4509

  
4457 4510
CXXFLAGS="$CXXFLAGS_BUILD $SV_DEFINES_BUILD"
4511
LDFLAGS="$LDFLAGS_BUILD"
4458 4512

  
4459 4513
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
4460 4514
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
......
7174 7228
fi
7175 7229

  
7176 7230

  
7231
SV_MODULE_MODULE=opus
7232
SV_MODULE_VERSION_TEST="opusfile"
7233
SV_MODULE_HEADER=opus/opusfile.h
7234
SV_MODULE_LIB=opusfile
7235
SV_MODULE_FUNC=op_read_float
7236
SV_MODULE_HAVE=HAVE_$(echo opus | tr 'a-z' 'A-Z')
7237
SV_MODULE_FAILED=1
7238
if test -n "$opus_LIBS" ; then
7239
   { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
7240
$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
7241
   CXXFLAGS="$CXXFLAGS $opus_CFLAGS"
7242
   LIBS="$LIBS $opus_LIBS"
7243
   SV_MODULE_FAILED=""
7244
fi
7245
if test -z "$SV_MODULE_VERSION_TEST" ; then
7246
   SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
7247
fi
7248
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
7249

  
7250
pkg_failed=no
7251
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus" >&5
7252
$as_echo_n "checking for opus... " >&6; }
7253

  
7254
if test -n "$opus_CFLAGS"; then
7255
    pkg_cv_opus_CFLAGS="$opus_CFLAGS"
7256
 elif test -n "$PKG_CONFIG"; then
7257
    if test -n "$PKG_CONFIG" && \
7258
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
7259
  ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
7260
  ac_status=$?
7261
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7262
  test $ac_status = 0; }; then
7263
  pkg_cv_opus_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
7264
		      test "x$?" != "x0" && pkg_failed=yes
7265
else
7266
  pkg_failed=yes
7267
fi
7268
 else
7269
    pkg_failed=untried
7270
fi
7271
if test -n "$opus_LIBS"; then
7272
    pkg_cv_opus_LIBS="$opus_LIBS"
7273
 elif test -n "$PKG_CONFIG"; then
7274
    if test -n "$PKG_CONFIG" && \
7275
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
7276
  ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
7277
  ac_status=$?
7278
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7279
  test $ac_status = 0; }; then
7280
  pkg_cv_opus_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
7281
		      test "x$?" != "x0" && pkg_failed=yes
7282
else
7283
  pkg_failed=yes
7284
fi
7285
 else
7286
    pkg_failed=untried
7287
fi
7288

  
7289

  
7290

  
7291
if test $pkg_failed = yes; then
7292
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7293
$as_echo "no" >&6; }
7294

  
7295
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
7296
        _pkg_short_errors_supported=yes
7297
else
7298
        _pkg_short_errors_supported=no
7299
fi
7300
        if test $_pkg_short_errors_supported = yes; then
7301
	        opus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
7302
        else
7303
	        opus_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
7304
        fi
7305
	# Put the nasty error message in config.log where it belongs
7306
	echo "$opus_PKG_ERRORS" >&5
7307

  
7308
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7309
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
7310
elif test $pkg_failed = untried; then
7311
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7312
$as_echo "no" >&6; }
7313
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7314
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
7315
else
7316
	opus_CFLAGS=$pkg_cv_opus_CFLAGS
7317
	opus_LIBS=$pkg_cv_opus_LIBS
7318
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7319
$as_echo "yes" >&6; }
7320
	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $opus_CFLAGS";LIBS="$LIBS $opus_LIBS";SV_MODULE_FAILED=""
7321
fi
7322
fi
7323
if test -n "$SV_MODULE_FAILED"; then
7324
   as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
7325
ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
7326
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
7327
  HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
7328
else
7329
  { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5
7330
$as_echo "$as_me: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&6;}
7331
fi
7332

  
7333

  
7334
   if test -z "$SV_MODULE_FAILED"; then
7335
      if test -n "$SV_MODULE_LIB"; then
7336
           as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh`
7337
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5
7338
$as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; }
7339
if eval \${$as_ac_Lib+:} false; then :
7340
  $as_echo_n "(cached) " >&6
7341
else
7342
  ac_check_lib_save_LIBS=$LIBS
7343
LIBS="-l$SV_MODULE_LIB  $LIBS"
7344
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7345
/* end confdefs.h.  */
7346

  
7347
/* Override any GCC internal prototype to avoid an error.
7348
   Use char because int might match the return type of a GCC
7349
   builtin and then its argument prototype would still apply.  */
7350
#ifdef __cplusplus
7351
extern "C"
7352
#endif
7353
char $SV_MODULE_FUNC ();
7354
int
7355
main ()
7356
{
7357
return $SV_MODULE_FUNC ();
7358
  ;
7359
  return 0;
7360
}
7361
_ACEOF
7362
if ac_fn_cxx_try_link "$LINENO"; then :
7363
  eval "$as_ac_Lib=yes"
7364
else
7365
  eval "$as_ac_Lib=no"
7366
fi
7367
rm -f core conftest.err conftest.$ac_objext \
7368
    conftest$ac_exeext conftest.$ac_ext
7369
LIBS=$ac_check_lib_save_LIBS
7370
fi
7371
eval ac_res=\$$as_ac_Lib
7372
	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
7373
$as_echo "$ac_res" >&6; }
7374
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
7375
  LIBS="$LIBS -l$SV_MODULE_LIB"
7376
else
7377
  { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5
7378
$as_echo "$as_me: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&6;}
7379
fi
7380

  
7381
      fi
7382
   fi
7383
fi
7384

  
7385

  
7177 7386
# Link in -lX11 if it exists -- this is for the X error handler
7178 7387

  
7179 7388
SV_MODULE_MODULE=X11
configure.ac
40 40
SV_CHECK_QT
41 41

  
42 42
SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING"
43
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING"
44
SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE"
43
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING -DNO_HIT_COUNTS"
45 44

  
46 45
# Now we have: USER_CXXFLAGS contains any flags the user set
47 46
# explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought
......
49 48
# allow ourselves to be overridden (later) by the former
50 49

  
51 50
CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
51
OPTFLAGS_DEBUG="-O2"
52
LDFLAGS_DEBUG=""
52 53
CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
53
CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
54
OPTFLAGS_RELEASE="-O2"
55
LDFLAGS_RELEASE=""
56
CXXSTANDARD=c++14
54 57

  
55 58
if test "x$GCC" = "xyes"; then
56
   	CXXFLAGS_ANY="-std=c++11 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
59
   	CXXFLAGS_ANY="-fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
57 60
        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
58
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
59
   	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
61
        OPTFLAGS_DEBUG="-O2"
62
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0"
63
        OPTFLAGS_RELEASE="-O3 -ffast-math"
64
        LIBS_DEBUG="$LIBS"
65
        AX_CHECK_COMPILE_FLAG(--std=$CXXSTANDARD, [], [AC_MSG_NOTICE([Compiler does not appear to support $CXXSTANDARD, falling back to c++11])
66
        CXXSTANDARD=c++11])
60 67
fi
61 68

  
62
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
69
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE $OPTFLAGS_RELEASE"
70
LDFLAGS_BUILD="$LDFLAGS_RELEASE $OPTFLAGS_RELEASE"
63 71
SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
64 72

  
65 73
QMAKE_CONFIG="release"
66 74

  
67 75
AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable debug support [default=no]])],[AC_MSG_NOTICE([enabling debug build])
68 76
QMAKE_CONFIG="debug"
69
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG"
70
SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"])
77
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG $OPTFLAGS_DEBUG"
78
LDFLAGS_BUILD="$LDFLAGS_DEBUG"
79
SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"
80
LIBS="$LIBS_DEBUG"])
71 81

  
72 82
if test x"$USER_CXXFLAGS" != x; then
73 83
   	AC_MSG_NOTICE([The CXXFLAGS environment variable is set to "$USER_CXXFLAGS".])
74 84
	AC_MSG_NOTICE(Overriding default compiler flags with the above user setting.)
75 85
	CXXFLAGS_BUILD="$USER_CXXFLAGS"
76
	CXXFLAGS_MINIMAL="$USER_CXXFLAGS"
86
        LDFLAGS_BUILD=""
77 87
fi
78 88

  
79 89
CXXFLAGS="$CXXFLAGS_BUILD $SV_DEFINES_BUILD"
90
LDFLAGS="$LDFLAGS_BUILD"
80 91

  
81 92
SV_MODULE_REQUIRED([bz2],[],[bzlib.h],[bz2],[BZ2_bzReadOpen])
82 93
SV_MODULE_REQUIRED([fftw3],[fftw3 >= 3.0.0],[fftw3.h],[fftw3],[fftw_execute])
......
113 124
SV_MODULE_OPTIONAL([fishsound],[fishsound >= 1.0.0],[fishsound/fishsound.h],[fishsound],[fish_sound_new])
114 125
SV_MODULE_OPTIONAL([mad],[mad >= 0.15.0],[mad.h],[mad],[mad_decoder_init])
115 126
SV_MODULE_OPTIONAL([id3tag],[id3tag >= 0.15.0],[id3tag.h],[id3tag],[id3_tag_new])
127
SV_MODULE_OPTIONAL([opus],[opusfile],[opus/opusfile.h],[opusfile],[op_read_float])
116 128

  
117 129
# Link in -lX11 if it exists -- this is for the X error handler
118 130
SV_MODULE_OPTIONAL([X11],[x11 >= 1.0.0],[X11/X.h],[x11],[XGetErrorText])
......
125 137

  
126 138
AC_SUBST(CFLAGS)
127 139
AC_SUBST(CXXFLAGS)
128
AC_SUBST(CXXFLAGS_MINIMAL)
140
AC_SUBST(CXXSTANDARD)
129 141
AC_SUBST(LDFLAGS)
130 142
AC_SUBST(HAVES)
131 143
AC_SUBST(LIBS)
convert.pro
1 1

  
2 2
TEMPLATE = app
3 3

  
4
CONFIG += stl c++11 exceptions console warn_on
5

  
4
CONFIG += stl exceptions console warn_on
6 5
CONFIG -= qt
7 6

  
8 7
exists(config.pri) {
......
31 30
OBJECTS_DIR = o
32 31
MOC_DIR = o
33 32

  
34
INCLUDEPATH += piper-cpp piper-cpp/ext vamp-plugin-sdk
33
INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk
35 34

  
36 35
include(vamp-plugin-sdk-files.pri)
37 36

  
......
39 38
for (file, VAMP_HEADERS) { HEADERS += $$file }
40 39

  
41 40
HEADERS += \
42
        piper-cpp/vamp-capnp/piper.capnp.h \
43
        piper-cpp/vamp-capnp/VampnProto.h
41
        piper-vamp-cpp/vamp-capnp/piper.capnp.h \
42
        piper-vamp-cpp/vamp-capnp/VampnProto.h
44 43

  
45 44
SOURCES += \
46
        piper-cpp/vamp-capnp/piper-capnp.cpp \
47
        piper-cpp/ext/json11/json11.cpp \
48
        piper-cpp/vamp-server/convert.cpp
45
        piper-vamp-cpp/vamp-capnp/piper-capnp.cpp \
46
        piper-vamp-cpp/ext/json11/json11.cpp \
47
        piper-vamp-cpp/vamp-server/convert.cpp
main/MainWindow.cpp
165 165

  
166 166
    Preferences::getInstance()->setSpectrogramSmoothing
167 167
        (Preferences::SpectrogramInterpolated);
168
//        (Preferences::NoSpectrogramSmoothing);
169 168

  
170 169
    Preferences::getInstance()->setSpectrogramXSmoothing
171 170
        (Preferences::SpectrogramXInterpolated);
172
//        (Preferences::NoSpectrogramXSmoothing);
173 171

  
174 172
    QSettings settings;
175 173

  
......
178 176
    settings.setValue("waveform",
179 177
                      QString("<layer scale=\"%1\" channelMode=\"%2\"/>")
180 178
                      .arg(int(WaveformLayer::MeterScale))
181
//                      .arg(int(WaveformLayer::LinearScale))
182 179
                      .arg(int(WaveformLayer::MergeChannels)));
183 180

  
184 181
    settings.setValue("timevalues",
......
186 183
                      .arg(int(TimeValueLayer::PlotStems)));
187 184

  
188 185
    settings.setValue("spectrogram",
189
                      QString("<layer channel=\"-1\" windowSize=\"1024\" windowHopLevel=\"2\"/>"));
186
                      QString("<layer channel=\"-1\" windowSize=\"1024\" colourMap=\"Cividis\" windowHopLevel=\"2\"/>"));
190 187

  
191 188
    settings.setValue("melodicrange",
192
                      QString("<layer channel=\"-1\" gain=\"150\" normalizeVisibleArea=\"false\" normalizeColumns=\"false\" normalizeHybrid=\"true\" minFrequency=\"100\" maxFrequency=\"1200\" windowSize=\"4096\" windowOverlap=\"75\" binDisplay=\"0\" />"));
189
                      QString("<layer channel=\"-1\" gain=\"1\" normalizeVisibleArea=\"false\" columnNormalization=\"hybrid\" colourMap=\"Ice\" minFrequency=\"80\" maxFrequency=\"1500\" windowSize=\"8192\" windowOverlap=\"75\" binDisplay=\"0\" />"));
193 190

  
194 191
    settings.endGroup();
195 192

  
repoint
58 58
    # That is fixed in v5.7.1, so we could promote it up the order
59 59
    # again at some point in future
60 60
    elif echo | poly -v 2>/dev/null | grep -q 'Poly/ML'; then
61
	sml="poly"
61
	sml="polyml"
62 62
    elif mlton 2>&1 | grep -q 'MLton'; then
63 63
	sml="mlton"
64 64
    # MLKit is at the bottom because it leaves compiled files around
......
109 109
done
110 110

  
111 111
case "$sml" in
112
    poly)
112
    polyml)
113 113
        if [ -n "$local_install" ] && polyc --help >/dev/null 2>&1 ; then
114 114
            if [ ! -x "$gen_out" ]; then
115 115
                polyc -o "$gen_out" "$program"
repoint-lock.json
1 1
{
2 2
  "libraries": {
3 3
    "vamp-plugin-sdk": {
4
      "pin": "da86fb0bccb3"
4
      "pin": "b650289c47b4"
5 5
    },
6 6
    "svcore": {
7
      "pin": "a92e94215863"
7
      "pin": "901f37d32060"
8 8
    },
9 9
    "svgui": {
10
      "pin": "8068a0bee550"
10
      "pin": "aa0616116537"
11 11
    },
12 12
    "svapp": {
13
      "pin": "9e15607531b2"
13
      "pin": "e19c609a7bec"
14 14
    },
15 15
    "checker": {
16
      "pin": "2e8a5f665a07"
16
      "pin": "5c60e26e16ca"
17 17
    },
18 18
    "piper": {
19 19
      "pin": "f5a04ffe4d5a0ae01e77018a86a59b48a425e674"
20 20
    },
21
    "piper-cpp": {
22
      "pin": "44cb74e186a703e7e6ce403aa295913a87b88d62"
21
    "piper-vamp-cpp": {
22
      "pin": "0e3328c6091f59c912e25bc392a7dc75182be1c7"
23 23
    },
24 24
    "dataquay": {
25
      "pin": "807b55408d9e"
25
      "pin": "b82360a98f49"
26 26
    },
27 27
    "bqvec": {
28
      "pin": "3c9de9e7f6e8"
28
      "pin": "c2d355c29372"
29 29
    },
30 30
    "bqfft": {
31
      "pin": "a766fe47501b"
31
      "pin": "ff1d1bd48876"
32 32
    },
33 33
    "bqresample": {
34
      "pin": "a9a5555d9b6d"
34
      "pin": "f5dee7d40378"
35 35
    },
36 36
    "bqaudioio": {
37
      "pin": "138a7a8b546b"
37
      "pin": "8c4162878ae6"
38
    },
39
    "bqaudiostream": {
40
      "pin": "f6df3ce6f229"
41
    },
42
    "bqthingfactory": {
43
      "pin": "7686116dcdd5"
38 44
    },
39 45
    "sv-dependency-builds": {
40
      "pin": "f1a9b270e043"
46
      "pin": "f3731af47c4b"
41 47
    },
42 48
    "icons/scalable": {
43
      "pin": "1c6516ba7fc1"
49
      "pin": "1c8844bfa946"
44 50
    }
45 51
  }
46 52
}
repoint-project.json
36 36
	    "service": "github",
37 37
	    "owner": "piper-audio"
38 38
        },
39
        "piper-cpp": {
39
        "piper-vamp-cpp": {
40 40
            "vcs": "git",
41
	    "service": "github",
42
	    "owner": "piper-audio",
43
            "repository": "piper-vamp-cpp"
41
            "service": "github",
42
            "owner": "piper-audio"
44 43
        },
45 44
        "dataquay": {
46 45
            "vcs": "hg",
......
67 66
            "service": "bitbucket",
68 67
            "owner": "breakfastquay"
69 68
        },
69
        "bqaudiostream": {
70
            "vcs": "hg",
71
            "service": "bitbucket",
72
            "owner": "breakfastquay"
73
        },
74
        "bqthingfactory": {
75
            "vcs": "hg",
76
            "service": "bitbucket",
77
            "owner": "breakfastquay"
78
        },
70 79
        "sv-dependency-builds": {
71 80
            "vcs": "hg",
72 81
	    "service": "soundsoftware"
repoint.pri
1

  
2
repoint.target = $$PWD/.repoint.point
3
repoint.depends = $$PWD/repoint-project.json $$PWD/repoint-lock.json
4
repoint.commands = $$PWD/repoint install --directory $$PWD
5

  
6
QMAKE_EXTRA_TARGETS += repoint
7
PRE_TARGETDEPS += $$repoint.target
repoint.sml
38 38
    authorization.
39 39
*)
40 40

  
41
val repoint_version = "0.9.98"
41
val repoint_version = "1.1"
42 42

  
43 43

  
44 44
datatype vcs =
......
136 136
structure RepointFilenames = struct
137 137
    val project_file = "repoint-project.json"
138 138
    val project_lock_file = "repoint-lock.json"
139
    val project_completion_file = ".repoint.point"
139 140
    val user_config_file = ".repoint.json"
140 141
    val archive_dir = ".repoint-archive"
141 142
end
......
215 216
    val nonempty_dir_exists : string -> bool
216 217
    val project_spec_path : string -> string
217 218
    val project_lock_path : string -> string
219
    val project_completion_path : string -> string
218 220
    val verbose : unit -> bool
219 221
end = struct
220 222

  
......
272 274
    fun project_lock_path rootpath =
273 275
        project_file_path rootpath (RepointFilenames.project_lock_file)
274 276

  
277
    fun project_completion_path rootpath =
278
        project_file_path rootpath (RepointFilenames.project_completion_file)
279

  
275 280
    fun trim str =
276 281
        hd (String.fields (fn x => x = #"\n" orelse x = #"\r") str)
277 282
            
......
2420 2425
    in
2421 2426
        JsonBits.save_json_to lock_file lock_json
2422 2427
    end
2423
        
2428

  
2429
fun checkpoint_completion_file rootpath =
2430
    let val completion_file = FileBits.project_completion_path rootpath
2431
        val stream = TextIO.openOut completion_file
2432
    in
2433
        TextIO.closeOut stream
2434
    end
2435
                                                               
2424 2436
fun pad_to n str =
2425 2437
    if n <= String.size str then str
2426 2438
    else pad_to n (str ^ " ")
......
2586 2598
        val _ = if List.exists (fn (_, OK _) => true | _ => false) outcomes
2587 2599
                then lock_project project
2588 2600
                else OS.Process.success
2601
        val return_code = return_code_for outcomes
2589 2602
    in
2590
        return_code_for outcomes
2603
        if OS.Process.isSuccess return_code
2604
        then checkpoint_completion_file (#rootpath context)
2605
        else ();
2606
        return_code
2591 2607
    end
2592 2608
    
2593 2609
fun load_local_project pintype =
......
2625 2641
fun usage () =
2626 2642
    (print "\nRepoint ";
2627 2643
     version ();
2628
     print ("\nA simple manager for third-party source code dependencies.\n\n"
2644
     print ("\n  A simple manager for third-party source code dependencies.\n"
2645
            ^ "  http://all-day-breakfast.com/repoint/\n\n"
2629 2646
            ^ "Usage:\n\n"
2630
            ^ "  repoint <command>\n\n"
2647
            ^ "  repoint <command> [<options>]\n\n"
2631 2648
            ^ "where <command> is one of:\n\n"
2632 2649
            ^ "  status   print quick report on local status only, without using network\n"
2633 2650
            ^ "  review   check configured libraries against their providers, and report\n"
2634 2651
            ^ "  install  update configured libraries according to project specs and lock file\n"
2635 2652
            ^ "  update   update configured libraries and lock file according to project specs\n"
2636
            ^ "  lock     update lock file to match local library status\n"
2637
            ^ "  archive  pack up project and all libraries into an archive file\n"
2638
            ^ "           (invoke as 'repoint archive target-file.tar.gz')\n"
2639
            ^ "  version  print the Repoint version number and exit\n\n");
2653
            ^ "  lock     rewrite lock file to match local library status\n"
2654
            ^ "  archive  pack up project and all libraries into an archive file:\n"
2655
            ^ "           invoke as 'repoint archive targetfile.tar.gz --exclude unwanted.txt'\n"
2656
            ^ "  version  print the Repoint version number and exit\n\n"
2657
            ^ "and <options> may include:\n\n"
2658
            ^ "  --directory <dir>\n"
2659
            ^ "           change to directory <dir> before doing anything; in particular,\n"
2660
            ^ "           expect to find project spec file in that directory\n\n");
2640 2661
    OS.Process.failure)
2641 2662

  
2642 2663
fun archive target args =
......
2647 2668
        with_local_project USE_LOCKFILE (Archive.archive (target, xs))
2648 2669
      | _ => usage ()
2649 2670

  
2671
fun handleSystemArgs args =
2672
    let fun handleSystemArgs' leftover args =
2673
            case args of
2674
                "--directory"::dir::rest =>
2675
                (OS.FileSys.chDir dir;
2676
                 handleSystemArgs' leftover rest)
2677
              | arg::rest =>
2678
                handleSystemArgs' (leftover @ [arg]) rest
2679
              | [] => leftover
2680
    in
2681
        OK (handleSystemArgs' [] args)
2682
        handle e => ERROR (exnMessage e)
2683
    end
2684
                   
2650 2685
fun repoint args =
2651
    let val return_code = 
2686
    case handleSystemArgs args of
2687
        ERROR e => (print ("Error: " ^ e ^ "\n");
2688
                    OS.Process.exit OS.Process.failure)
2689
      | OK args => 
2690
        let val return_code = 
2652 2691
            case args of
2653 2692
                ["review"] => review ()
2654 2693
              | ["status"] => status ()
......
2660 2699
              | arg::_ => (print ("Error: unknown argument \"" ^ arg ^ "\"\n");
2661 2700
                           usage ())
2662 2701
              | _ => usage ()
2663
    in
2664
        OS.Process.exit return_code;
2665
        ()
2666
    end
2702
        in
2703
            OS.Process.exit return_code
2704
        end
2667 2705
        
2668 2706
fun main () =
2669 2707
    repoint (CommandLine.arguments ())
server.pro
1 1

  
2 2
TEMPLATE = app
3 3

  
4
CONFIG += stl c++11 exceptions console warn_on
5

  
4
CONFIG += stl exceptions console warn_on
6 5
CONFIG -= qt
7 6

  
8 7
exists(config.pri) {
......
31 30
OBJECTS_DIR = o
32 31
MOC_DIR = o
33 32

  
34
INCLUDEPATH += piper-cpp piper-cpp/ext vamp-plugin-sdk
33
INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk
35 34

  
36 35
include(vamp-plugin-sdk-files.pri)
37 36

  
......
39 38
for (file, VAMP_HEADERS) { HEADERS += $$file }
40 39

  
41 40
HEADERS += \
42
        piper-cpp/vamp-capnp/piper.capnp.h \
43
        piper-cpp/vamp-capnp/VampnProto.h
41
        piper-vamp-cpp/vamp-capnp/piper.capnp.h \
42
        piper-vamp-cpp/vamp-capnp/VampnProto.h
44 43

  
45 44
SOURCES += \
46
        piper-cpp/vamp-capnp/piper-capnp.cpp \
47
        piper-cpp/ext/json11/json11.cpp \
48
        piper-cpp/vamp-server/simple-server.cpp
45
        piper-vamp-cpp/vamp-capnp/piper-capnp.cpp \
46
        piper-vamp-cpp/ext/json11/json11.cpp \
47
        piper-vamp-cpp/vamp-server/simple-server.cpp
vectapp.pro
17 17
linux*:TARGET = sonic-vector
18 18
solaris*:TARGET = sonic-vector
19 19

  
20
!win32 {
21
    PRE_TARGETDEPS += $$PWD/libbase.a
22
    QMAKE_POST_LINK += cp checker/vamp-plugin-load-checker .
23
}
24

  
25
linux* {
26

  
27
    vect_bins.path = $$PREFIX_PATH/bin/
28
    vect_bins.files = checker/vamp-plugin-load-checker piper-vamp-simple-server sonic-vector
29
    vect_bins.CONFIG = no_check_exist
30

  
31
#    vect_desktop.path = $$PREFIX_PATH/share/applications/
32
#    vect_desktop.files = sonic-visualiser.desktop
33
#    vect_desktop.CONFIG = no_check_exist
34

  
35
#    vect_icon.path = $$PREFIX_PATH/share/icons/hicolor/scalable/apps/
36
#    vect_icon.files = icons/sonic-visualiser.svg
37
#    vect_icon.CONFIG = no_check_exist
38
    
39
     INSTALLS += vect_bins
40
#vect_desktop vect_icon
41
}
42

  
20 43
TRANSLATIONS += \
21 44
        i18n/sonic-visualiser_ru.ts \
22 45
	i18n/sonic-visualiser_en_GB.ts \

Also available in: Unified diff