1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 06:36:55 +02:00

More cross-compilation fixes.

This commit is contained in:
Dominik Schmidt
2011-05-25 03:44:33 +02:00
parent 1370756e0a
commit 20ad274dae
3 changed files with 4 additions and 5 deletions

View File

@@ -137,5 +137,6 @@ ENDIF( NOT APPLE )
ADD_SUBDIRECTORY( thirdparty ) ADD_SUBDIRECTORY( thirdparty )
ADD_SUBDIRECTORY( src/libtomahawk ) ADD_SUBDIRECTORY( src/libtomahawk )
SET( TOMAHAWK_LIBRARIES tomahawklib )
ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( src )
ADD_SUBDIRECTORY( admin ) ADD_SUBDIRECTORY( admin )

View File

@@ -4,9 +4,8 @@ ADD_DEFINITIONS( /DNOMINMAX )
ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN ) ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN )
ADD_DEFINITIONS( -static-libgcc ) ADD_DEFINITIONS( -static-libgcc )
SET( QXTWEB_LIBRARIES qxtweb-standalone )
SET( TOMAHAWK_LIBRARIES ${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll )
SET( QXTWEB_LIBRARIES ${CMAKE_BINARY_DIR}/thirdparty/qxt/qxtweb-standalone/libqxtweb-standalone.dll )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}

View File

@@ -29,14 +29,13 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
"winmm.dll" "winmm.dll"
"iphlpapi.a" "iphlpapi.a"
${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll
) )
ENDIF( WIN32 ) ENDIF( WIN32 )
target_link_libraries( tomahawk_sipzeroconf target_link_libraries( tomahawk_sipzeroconf
${QT_LIBRARIES} ${QT_LIBRARIES}
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
tomahawklib ${TOMAHAWK_LIBRARIES}
) )
IF( APPLE ) IF( APPLE )