mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-20 16:02:07 +02:00
Code Issues Releases Wiki Activity

Make Tomahawk cross-compile completely.

Browse Source
This commit is contained in:
Dominik Schmidt 2010-11-03 19:04:55 +01:00
parent be2b9c7ab3
commit d165528b0a
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -321,9 +321,17 @@ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
TARGET_LINK_LIBRARIES( tomahawk
${QT_LIBRARIES}
${MAC_EXTRA_LIBS}
${OS_SPECIFIC_LINK_LIBRARIES}
echonest
portfwd
${OS_SPECIFIC_LINK_LIBRARIES}
lastfm
qjson
tag
mad
vorbis
vorbisenc
vorbisfile
gloox
echonest
)
INCLUDE( "CPack.txt" )

19
src/CMakeLists.win32.txt
View File

@ -1,6 +1,8 @@
ADD_DEFINITIONS( /DNOMINMAX )
ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN )
ADD_DEFINITIONS( -static-libgcc )
ADD_DEFINITIONS( /DNO_LIBLASTFM )
ADD_DEFINITIONS( -DNO_OGG )
# Add manual locations to stuff:
INCLUDE_DIRECTORIES(
@ -16,12 +18,8 @@ INCLUDE_DIRECTORIES(
)
SET( OS_SPECIFIC_LINK_LIBRARIES
"${CMAKE_CURRENT_SOURCE_DIR}/../../gloox-1.0/src/.libs/libgloox.a"
"${CMAKE_CURRENT_SOURCE_DIR}/../../qjson/build/lib/libqjson.dll.a"
"${CMAKE_CURRENT_SOURCE_DIR}/../../taglib-1.6.3/build/taglib/libtag.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.3/lib/libz.a"
"secur32.dll"
"Crypt32.dll"
"crypt32.dll"
"ws2_32.dll"
"dnsapi.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/../qxtweb-standalone/libqxtweb-standalone.dll"
@ -29,7 +27,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/tomahawk.res"
#"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/tomahawk.res"
)
IF( "${gui}" STREQUAL "no" )
@ -42,10 +40,9 @@ ELSE()
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
"dsound.dll"
"winmm.dll"
"winmm.dll"
"iphlpapi.a"
"${CMAKE_CURRENT_SOURCE_DIR}/../rtaudio/librtaudio.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/libmad.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/libvorbisfile.dll"
"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/liblastfm.dll"
)
ENDIF()
ENDIF()

1
src/settingsdialog.cpp
View File

@ -6,6 +6,7 @@
#include <QDebug>
#include <QFileDialog>
#include <QMessageBox>
#include <QNetworkProxy>
#ifndef NO_LIBLASTFM
#include <lastfm/ws.h>