changeset 70:8fa569b9a8f1

Workaround for no results from MySQL DB
author gyorgyf
date Fri, 07 Dec 2012 23:17:09 +0000
parents 0ef80ae6493c
children 9600f5b8076f
files Makefile sonic-annotator version.h
diffstat 3 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Feb 24 12:32:39 2012 +0000
+++ b/Makefile	Fri Dec 07 23:17:09 2012 +0000
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: sonic-annotator
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon Feb 13 14:04:05 2012
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Dec 5 17:36:10 2012
 # Project:  sonic-annotator.pro
 # Template: app
-# Command: /usr/bin/qmake-qt4 -unix -o Makefile sonic-annotator.pro
+# Command: /usr/bin/qmake -unix -o Makefile sonic-annotator.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -12,15 +12,14 @@
 CXX           = g++
 DEFINES       = -DHAVE_BZ2 -DHAVE_FFTW3 -DHAVE_FFTW3F -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DHAVE_VAMP -DHAVE_VAMPHOSTSDK -DHAVE_RUBBERBAND -DHAVE_RASQAL -DHAVE_REDLAND -DHAVE_LIBLO -DHAVE_PORTAUDIO_2_0 -DHAVE_JACK -DHAVE_LIBPULSE -DHAVE_LRDF -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_MAD -DHAVE_ID3TAG -DQT_NO_DEBUG -DQT_XML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -g -O2 -O2 -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -g0 -O2 -Wall -pipe -DNDEBUG -DBUILD_RELEASE -DNO_TIMING -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/include/rasqal -D_REENTRANT -O2 -fmessage-length=80 -fdiagnostics-show-location=every-line -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -g0 -O2 -Wall -pipe -DNDEBUG -DBUILD_RELEASE -DNO_TIMING -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/include/rasqal -pthread -D_REENTRANT -O2 -fmessage-length=80 -fdiagnostics-show-location=every-line -Wall -W -D_REENTRANT $(DEFINES)
 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtXml -I/usr/include/qt4 -I. -I../svcore -Io
 LINK          = g++
 LFLAGS        = -Wl,-O1
-#LIBS          = $(SUBLIBS)  -L../svcore -L/usr/lib -lsvcore -lasound -lbz2 -lfftw3 -lfftw3f -lm -lsndfile -lsamplerate -lpulse -L/usr/local/lib -lvamp-hostsdk -ldl -lrubberband -lrdf -lrasqal -lraptor -llo -ljack -lrt -llrdf -loggz -logg -lfishsound -lmad -lid3tag -lz -lpthread -lQtXml -lQtNetwork -lQtCore 
-LIBS          = $(SUBLIBS)  -L../svcore -L/usr/lib -L/usr/local/lib -Wl,-Bstatic -lsvcore -lasound -lbz2 -lfftw3 -lfftw3f -lm -lsndfile -lsamplerate -lvamp-hostsdk -lrubberband -llo -ljack -lrt -llrdf -loggz -logg -lfishsound -lmad -lz -lid3tag -Wl,-Bdynamic -lQtXml -lQtNetwork -lQtCore -lpthread -ldl -lpulse -lrdf -lrasqal -lraptor 
+LIBS          = $(SUBLIBS)  -L../svcore -L/usr/lib -lsvcore -lbz2 -lfftw3 -lfftw3f -lsndfile -lsamplerate -L/usr/local/lib -lvamp-hostsdk -ldl -lrubberband -lrdf -lrasqal -lraptor -llo -lportaudio -lasound -lm -ljack -lrt -lpulse -llrdf -loggz -logg -lfishsound -lmad -lid3tag -lz -lpthread -lQtXml -lQtNetwork -lQtCore 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /usr/bin/qmake-qt4
+QMAKE         = /usr/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
Binary file sonic-annotator has changed
--- a/version.h	Fri Feb 24 12:32:39 2012 +0000
+++ b/version.h	Fri Dec 07 23:17:09 2012 +0000
@@ -1,1 +1,1 @@
-#define RUNNER_VERSION "0.6m4-1"
+#define RUNNER_VERSION "0.6hg"