Permalink
Browse files

install works better for liblastfm.pro

git-svn-id: svn+ssh://svn.last.fm/svn/clientside/trunk/desktop@124804 ab8f4a45-97f9-0310-bbd1-854ce3dcee89
  • Loading branch information...
1 parent f1ba316 commit 8939adb2b3536d550fe3b4f36b79e1e6bc360c75 @mxcl mxcl committed Mar 20, 2009
View
@@ -26,4 +26,7 @@ macx* {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
}
-INSTALL_DIR = /usr/local
+CONFIG( debug, debug|release ):CONFIG -= release
+
+release:INSTALL_DIR = $$(DESTDIR)$$(PREFIX)
+else:INSTALL_DIR = prefix
@@ -46,11 +46,15 @@ END
cat <<END>$d/README
Dependencies
============
-Taglib 1.5
+taglib 1.5
Qt 4.4
sqlite3
boost
+Build Dependencies
+==================
+ruby
+
Compile Errors
==============
Please, I'm not a support dude! I'd appreciate it if you don't email me until
View
@@ -24,10 +24,14 @@ mkdir( '_include/lastfm' )
def step3( path, classname )
- f = File.open( "_include/lastfm/#{classname}", "w" )
- f.write( "// this file was generated by penis\n" )
- f.write( "#include \"../../#{path}\"\n" )
- f.close()
+ if ARGV[1] == '--cp'
+ File.copy( path, '_include/lastfm/' + classname )
+ else
+ f = File.open( "_include/lastfm/#{classname}", "w" )
+ f.write( "// this file was generated by penis\n" )
+ f.write( "#include \"../../#{path}\"\n" )
+ f.close()
+ end
end
def step2( path )
@@ -1,43 +1,50 @@
-CONFIG( unicorn ) {
- LIBS += -lunicorn
- CONFIG += types
- QT += gui
-}
-CONFIG( listener ) {
- LIBS += -llistener
- CONFIG += types
-}
-CONFIG( radio ) {
- LIBS += -lradio
- CONFIG += types
- QT += phonon
-}
-CONFIG( scrobble ) {
- LIBS += -lscrobble
- CONFIG += types
-}
-CONFIG( fingerprint ) {
- LIBS += -lfingerprint
- CONFIG += types
-}
-CONFIG( resolver ) {
- LIBS += -lresolver
- win32:LIBS += -lmpr
- INCLUDEPATH += $$ROOT_DIR/app/clientplugins/localresolver
- CONFIG += taglib sqlite3
-}
-CONFIG( types ) {
- LIBS += -ltypes
- CONFIG += ws
-}
-CONFIG( ws ) {
- LIBS += -lws
- CONFIG += core
- QT += network
+CONFIG( all_in_one_liblastfm )
+{
+
+
}
-CONFIG( core ) {
- LIBS += -lcore
- QT += core xml
+else {
+ CONFIG( unicorn ) {
+ LIBS += -lunicorn
+ CONFIG += types
+ QT += gui
+ }
+ CONFIG( listener ) {
+ LIBS += -llistener
+ CONFIG += types
+ }
+ CONFIG( radio ) {
+ LIBS += -lradio
+ CONFIG += types
+ QT += phonon
+ }
+ CONFIG( scrobble ) {
+ LIBS += -lscrobble
+ CONFIG += types
+ }
+ CONFIG( fingerprint ) {
+ LIBS += -lfingerprint
+ CONFIG += types
+ }
+ CONFIG( resolver ) {
+ LIBS += -lresolver
+ win32:LIBS += -lmpr
+ INCLUDEPATH += $$ROOT_DIR/app/clientplugins/localresolver
+ CONFIG += taglib sqlite3
+ }
+ CONFIG( types ) {
+ LIBS += -ltypes
+ CONFIG += ws
+ }
+ CONFIG( ws ) {
+ LIBS += -lws
+ CONFIG += core
+ QT += network
+ }
+ CONFIG( core ) {
+ LIBS += -lcore
+ QT += core xml
+ }
}
# make work: #include <lastfm/*>
@@ -9,9 +9,6 @@ CONFIG( debug, debug|release ) {
QMAKE_CXXFLAGS_DEBUG = -ggdb
}
- #if debug is specified first, remove the release stuff! --mxcl
- CONFIG -= release
-
VERSION_UPDATE_PATTERN = *.*.*.*
}
else {
View
@@ -107,6 +107,8 @@ echo '#include "../../lib/lastfm/global.h"' > _include/lastfm/global.h
middle "Running qmake..."
+test -z "$PREFIX" && PREFIX=/usr/local
+
if [ $RELEASE ]
then
qmake -config release -recursive "CONFIG -= debug debug_and_release" Last.fm.pro
@@ -0,0 +1,9 @@
+if [ -z $1 ]
+then
+ echo "You must specify the prefix, eg. /usr"
+ exit 0
+fi
+
+for x in `../../admin/findsrc pro`; do ../../admin/penis $x --cp; done
+mkdir -p $1/include
+cp -R _include/lastfm $1/include
View
@@ -0,0 +1,21 @@
+TEMPLATE = lib
+TARGET = lastfm
+QT = core network xml phonon
+VERSION = 0.2
+
+include( $$ROOT_DIR/admin/include.qmake )
+include( _files.qmake )
+
+INSTALLS = target
+target.path = $$INSTALL_DIR/lib
+
+
+# for now because it doesn't work anyway
+SOURCES -= fingerprint/Sha256.cpp \
+ fingerprint/MP3_Source_Qt.cpp \
+ fingerprint/fplib/src/OptFFT.cpp \
+ fingerprint/fplib/src/FingerprintExtractor.cpp \
+ fingerprint/fplib/src/Filter.cpp \
+ fingerprint/Fingerprint.cpp \
+ fingerprint/Collection.cpp
+
View
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += lastfm/core/libcore.pro \
- lastfm/ws/libws.pro \
- lastfm/types/libtypes.pro \
- lastfm/scrobble/libscrobble.pro \
- lastfm/radio/libradio.pro
-
-dllexport.files = lastfm/global.h
-dllexport.path = $$INSTALL_DIR/include/lastfm
-INSTALLS = dllexport
@@ -64,7 +64,11 @@ UpdateDialog::UpdateDialog( QWidget* parent ) : QDialog( parent ), checking( 0 )
#endif
QUrl url( "http://cdn.last.fm/client/" + qApp->applicationName().toLower() + PLATFORM + qApp->applicationVersion() + ".txt" );
+<<<<<<< .mine
+ //QUrl url( "http://static.last.fm/client/update_test/200.txt" );
+=======
// QUrl url( "http://static.last.fm/client/update_test/201.txt" );
+>>>>>>> .r124078
checking = nam.get( QNetworkRequest(url) );
checking->setParent( this );

0 comments on commit 8939adb

Please sign in to comment.