Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Updated build system to use Qt5 instead of Qt4.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-24 16:12:22 -05:00
parent 5131b1d5fe
commit 57abeada3c
130 changed files with 481 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rdpadd/Makefile.am
View File

@@ -20,7 +20,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
@@ -35,7 +35,7 @@ dist_rdpadd_SOURCES = rdpadd.cpp rdpadd.h
nodist_rdpadd_SOURCES = moc_rdpadd.cpp
rdpadd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
rdpadd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~\
*.idb\

8
rdpadd/rdpadd.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell PAD Consolidation Server
//
// (C) Copyright 2018-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -21,8 +21,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <qcoreapplication.h>
#include <qhostaddress.h>
#include <QCoreApplication>
#include <QHostAddress>
#include <rd.h>
#include <rdcmd_switch.h>
@@ -73,7 +73,7 @@ QTcpSocket *MetadataSource::socket() const
MainObject::MainObject(QObject *parent)
: QObject(parent)
{
new RDCmdSwitch(qApp->argc(),qApp->argv(),"rdpadd",RDPADD_USAGE);
new RDCmdSwitch("rdpadd",RDPADD_USAGE);
//
// Client Server