Install libspotify, protobuf and gsttcp in the Windows installer. Also fix a build error on linux

This commit is contained in:
David Sansome 2011-04-30 18:32:39 +00:00
parent e6032a7c51
commit 1bf7577764
2 changed files with 8 additions and 2 deletions

View File

@ -148,8 +148,10 @@ Section "Clementine" Clementine
File "liborc-test-0.4-0.dll"
File "libplist.dll"
File "libpng14-14.dll"
File "libprotobuf-lite-7.dll"
File "libsoup-2.4-1.dll"
File "libspeex-1.dll"
File "libspotify.dll"
File "libtag.dll"
File "libtasn1-3.dll"
File "libusbmuxd.dll"
@ -375,6 +377,7 @@ Section "Gstreamer plugins" gstreamer-plugins
File "/oname=libgstspectrum.dll" "gstreamer-plugins\libgstspectrum.dll"
File "/oname=libgstspeex.dll" "gstreamer-plugins\libgstspeex.dll"
File "/oname=libgsttaglib.dll" "gstreamer-plugins\libgsttaglib.dll"
File "/oname=libgsttcp.dll" "gstreamer-plugins\libgsttcp.dll"
File "/oname=libgsttypefindfunctions.dll" "gstreamer-plugins\libgsttypefindfunctions.dll"
File "/oname=libgstudp.dll" "gstreamer-plugins\libgstudp.dll"
File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll"
@ -1091,8 +1094,10 @@ Section "Uninstall"
Delete "$INSTDIR\liborc-test-0.4-0.dll"
Delete "$INSTDIR\libplist.dll"
Delete "$INSTDIR\libpng14-14.dll"
Delete "$INSTDIR\libprotobuf-lite-7.dll"
Delete "$INSTDIR\libsoup-2.4-1.dll"
Delete "$INSTDIR\libspeex-1.dll"
Delete "$INSTDIR\libspotify.dll"
Delete "$INSTDIR\libtag.dll"
Delete "$INSTDIR\libtasn1-3.dll"
Delete "$INSTDIR\libusbmuxd.dll"
@ -1222,6 +1227,7 @@ Section "Uninstall"
Delete "$INSTDIR\gstreamer-plugins\libgstspeex.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstsouphttpsrc.dll"
Delete "$INSTDIR\gstreamer-plugins\libgsttaglib.dll"
Delete "$INSTDIR\gstreamer-plugins\libgsttcp.dll"
Delete "$INSTDIR\gstreamer-plugins\libgsttypefindfunctions.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstudp.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll"

View File

@ -22,9 +22,9 @@ set(HEADERS
qt4_wrap_cpp(MOC ${HEADERS})
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
if(WIN32 AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
set(win32_build_flag WIN32)
endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
endif(WIN32 AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
add_executable(clementine-spotifyblob
${SOURCES}