Permalink
Browse files

More of the same

git-svn-id: svn+ssh://svn.last.fm/svn/clientside/trunk/desktop@125295 ab8f4a45-97f9-0310-bbd1-854ce3dcee89
  • Loading branch information...
1 parent f89d848 commit deefd767bc92d5ec3d39ccf3634ab2d3e8caa90d @mxcl mxcl committed Mar 25, 2009
View
@@ -27,6 +27,3 @@ macx* {
}
CONFIG( debug, debug|release ):CONFIG -= release
-
-release:INSTALL_DIR = $$(DESTDIR)$$(PREFIX)
-else:INSTALL_DIR = prefix
View
@@ -4,10 +4,6 @@ include( qmake/QtOverride.pro.inc )
include( qmake/3rdparty.pro.inc )
include( qmake/1stparty.pro.inc )
-mac*{
- !macx-xcode:CONFIG -= app_bundle
-}
-
linux*{
CONFIG += link_pkgconfig
# use KDE phonon if installed in preference
@@ -1,50 +1,44 @@
-CONFIG( all_in_one_liblastfm )
-{
-
+CONFIG( unicorn ) {
+ LIBS += -lunicorn
+ CONFIG += types
+ QT += gui
}
-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
- }
+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/*>
@@ -5,8 +5,12 @@ CONFIG( taglib ) {
}
CONFIG( mad ) {
- win32: LIBS += -L$$COMMON_LIBS_DIR/libmad -lmad
- else {
+ win32{
+ LIBS += -L$$COMMON_LIBS_DIR/libmad -lmad
+ }else:CONFIG( app_bundle ){
+ LIBS += /opt/local/lib/libmad.a
+ INCLUDEPATH += /opt/local/include
+ }else{
CONFIG += link_pkgconfig
PKGCONFIG += mad
}
@@ -17,16 +21,24 @@ CONFIG( boost ) {
}
CONFIG( fftw3f ) {
- win32: LIBS += -L$$COMMON_LIBS_DIR/libfftw -lfftw3f
- else {
+ win32{
+ LIBS += -L$$COMMON_LIBS_DIR/libfftw -lfftw3f
+ }else:CONFIG( app_bundle ){
+ LIBS += /opt/local/lib/libfftw3f.a
+ INCLUDEPATH += /opt/local/include
+ }else{
CONFIG += link_pkgconfig
PKGCONFIG += fftw3f
}
}
CONFIG( samplerate ) {
- win32: LIBS += -L$$COMMON_LIBS_DIR/libsamplerate -lsamplerate
- else: {
+ win32{
+ LIBS += -L$$COMMON_LIBS_DIR/libsamplerate -lsamplerate
+ }else:CONFIG( app_bundle ){
+ LIBS += /opt/local/lib/libsamplerate.a
+ INCLUDEPATH += /opt/local/include
+ }else{
CONFIG += link_pkgconfig
PKGCONFIG += samplerate
}
@@ -14,5 +14,5 @@ CONFIG( debug, debug|release ) {
else {
CONFIG += warn_off
DEFINES += NDEBUG
- CONFIG += ppc x86
+ #macx*:CONFIG += ppc x86
}
View
@@ -134,8 +134,8 @@ else
if [ -z "$EXTRA_QMAKE_FLAGS" ]; then
EXTRA_QMAKE_FLAGS='NOOP=""'
fi
-
- qmake -config debug -recursive Last.fm.pro "$EXTRA_QMAKE_FLAGS" || die "Configure failed."
+
+ qmake -config debug -recursive Last.fm.pro "CONFIG -= app_bundle" "$EXTRA_QMAKE_FLAGS" || die "Configure failed."
BUILD_CMD='make'
fi;;
@@ -64,11 +64,7 @@ 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 );
@@ -160,7 +156,7 @@ UpdateDialog::install()
if (tmpFileName.endsWith(".msi")) {
// to do a so-called "minor upgrade", we need to use msiexec
// see: http://www.tramontana.co.hu/wix/lesson4.php
- // msiexec /i SampleUpgrade2.msi REINSTALL=ALL REINSTALLMODE=vomus
+ // msiexec /i SampleUpgrade2.msi REINSTALL=ALL REINSTALLMODE=vomus
if (-1 != _wspawnlp(_P_NOWAIT, L"msiexec.exe",
L"msiexec.exe", L"/i", tmpFileName.toStdWString().data(),
L"REINSTALL=ALL", L"REINSTALLMODE=vomus",

0 comments on commit deefd76

Please sign in to comment.