mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Fixed cross compiling with MinGW.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-13 05:58:05 +02:00
parent db4437cf62
commit 74d52e3208
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ SET( QT_USE_QTGUI TRUE )
SET( QT_USE_QTSQL TRUE ) SET( QT_USE_QTSQL TRUE )
SET( QT_USE_QTNETWORK TRUE ) SET( QT_USE_QTNETWORK TRUE )
SET( QT_USE_QTXML TRUE ) SET( QT_USE_QTXML TRUE )
SET( QT_USE_QTUITOOLS TRUE ) SET( QT_USE_UITOOLS TRUE )
include( ${QT_USE_FILE} ) include( ${QT_USE_FILE} )
@@ -489,7 +489,6 @@ target_link_libraries( tomahawklib
${LIBECHONEST_LIBRARY} ${LIBECHONEST_LIBRARY}
${QT_QTUITOOLS_LIBRARY} ${QT_QTUITOOLS_LIBRARY}
${QT_LIBRARIES} ${QT_LIBRARIES}
${QT_QTUITOOLS_LIBRARY} # We really need to link twice against it for windows, maybe QTBUG-20498 is related
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${LINK_LIBRARIES} ${LINK_LIBRARIES}

4
src/tomahawkapp.cpp
View File

@@ -20,6 +20,8 @@
#include "config.h" #include "config.h"
#include <iostream>
#include <QPluginLoader> #include <QPluginLoader>
#include <QDir> #include <QDir>
#include <QMetaType> #include <QMetaType>
@@ -303,6 +305,7 @@ TomahawkApp::instance()
return (TomahawkApp*)TOMAHAWK_APPLICATION::instance(); return (TomahawkApp*)TOMAHAWK_APPLICATION::instance();
} }
void void
TomahawkApp::printHelp() TomahawkApp::printHelp()
{ {
@@ -318,6 +321,7 @@ TomahawkApp::printHelp()
std::cout << QString( "For more documentation, see http://wiki.tomahawk-player.org/mediawiki/index.php/Tomahawk://_Links\n" ).toAscii().data(); std::cout << QString( "For more documentation, see http://wiki.tomahawk-player.org/mediawiki/index.php/Tomahawk://_Links\n" ).toAscii().data();
} }
#ifndef TOMAHAWK_HEADLESS #ifndef TOMAHAWK_HEADLESS
AudioControls* AudioControls*
TomahawkApp::audioControls() TomahawkApp::audioControls()