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

* Should fix win32 compile issues.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-01-17 09:22:47 +01:00
parent 350f470ab5
commit 850439fb04
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.win32.txt
View File

@@ -39,17 +39,8 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
"${CMAKE_CURRENT_SOURCE_DIR}/../build/src/libtomahawk/libtomahawklib.dll"
)
SET( tomahawkSourcesGui ${tomahawkSourcesGui} audio/rtaudiooutput.cpp )
SET( tomahawkHeadersGui ${tomahawkHeadersGui} audio/rtaudiooutput.h )
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
"dsound.dll"
"winmm.dll"
"iphlpapi.a"
"mad"
"vorbisfile"
"ogg"
"FLAC++"
"${CMAKE_CURRENT_SOURCE_DIR}/../rtaudio/librtaudio.dll"
)

23
src/libtomahawk/CMakeLists.txt
View File

@@ -220,19 +220,23 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
../../alsa-playback
)
qt4_wrap_ui( libUI_H ${libUI} )
qt4_wrap_cpp( libMoc ${libHeaders} )
SET( libSources ${libSources} ${libUI_H} )
add_library( tomahawklib SHARED ${libSources} ${libMoc} )
IF( WIN32 )
SET( libSources ${libSources} audio/rtaudiooutput.cpp )
SET( libHeaders ${libHeaders} audio/rtaudiooutput.h )
SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES}
"iphlpapi.a"
"ws2_32.dll"
"dnsapi.dll"
"dsound.dll"
"winmm.dll"
"mad"
"vorbisfile"
"ogg"
"FLAC++"
"${CMAKE_CURRENT_SOURCE_DIR}/../../rtaudio/librtaudio.dll"
)
ENDIF( WIN32 )
@@ -254,6 +258,13 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
ENDIF( UNIX AND NOT APPLE )
qt4_wrap_ui( libUI_H ${libUI} )
qt4_wrap_cpp( libMoc ${libHeaders} )
SET( libSources ${libSources} ${libUI_H} )
add_library( tomahawklib SHARED ${libSources} ${libMoc} )
target_link_libraries( tomahawklib
${QT_LIBRARIES}
${OS_SPECIFIC_LINK_LIBRARIES}