diff --git a/CMakeModules/NSIS.template.in b/CMakeModules/NSIS.template.in index 74dbb46fb..15e252d20 100644 --- a/CMakeModules/NSIS.template.in +++ b/CMakeModules/NSIS.template.in @@ -28,8 +28,8 @@ ; We use official release plugins ; mingw32-vlc from obs misses a lot and has even broken ones probably -!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\prefix" ; SIC! ^ -!define VLC_BIN "${VLC_PATH}\bin" +!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\" ; SIC! ^ +!define VLC_BIN "${VLC_PATH}" !define VLC_PLUGIN_PATH "${VLC_BIN}\plugins" !define NSI_PATH "${SOURCE_PATH}/admin/win/nsi" @@ -279,7 +279,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll" File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll" File "${INSTALL_PATH}\bin\libtomahawk_lastfm2.dll" - File "${INSTALL_PATH}\bin\libquazip.dll" File "${INSTALL_PATH}\bin\libtomahawklib.dll" File "${INSTALL_PATH}\lib\libtomahawk_sip*.dll" !endif @@ -294,7 +293,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${BUILD_PATH}\libqxtweb-standalone.dll" File "${BUILD_PATH}\libtomahawk_portfwd.dll" File "${BUILD_PATH}\libtomahawk_lastfm2.dll" - File "${BUILD_PATH}\libquazip.dll" File "${BUILD_PATH}\libtomahawk_sip*.dll" !endif @@ -307,8 +305,10 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${QT_DLL_PATH}\QtGui4.dll" File "${QT_DLL_PATH}\QtNetwork4.dll" File "${QT_DLL_PATH}\QtSql4.dll" - File "${QT_DLL_PATH}\QtXml4.dll" + File "${QT_DLL_PATH}\QtScript4.dll" + File "${QT_DLL_PATH}\QtUiTools4.dll" File "${QT_DLL_PATH}\QtWebKit4.dll" + File "${QT_DLL_PATH}\QtXml4.dll" ;SQLite driver SetOutPath "$INSTDIR\sqldrivers" @@ -329,13 +329,12 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${MING_BIN}\libstdc++-6.dll" ;Phonon stuff - File "${VLC_BIN}\libphonon.dll" + File "${MING_BIN}\libphonon.dll" SetOutPath "$INSTDIR\phonon_backend" File "${VLC_BIN}\phonon_backend\phonon_vlc.dll" SetOutPath "$INSTDIR" ;VLC - ;SetOutPath "$INSTDIR\phonon_backend" File "${VLC_BIN}\libvlc.dll" File "${VLC_BIN}\libvlccore.dll" SetOutPath "$INSTDIR\plugins" @@ -351,6 +350,7 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${MING_BIN}\libechonest.dll" File "${MING_BIN}\libQTweetLib.dll" + File "${MING_BIN}\libquazip.dll" ; Jabber File "${MING_BIN}\libjreen.dll" diff --git a/admin/win/Toolchain-mingw32-openSUSE.cmake b/admin/win/Toolchain-mingw32-openSUSE.cmake index 2dcd0ce69..77f933ae4 100644 --- a/admin/win/Toolchain-mingw32-openSUSE.cmake +++ b/admin/win/Toolchain-mingw32-openSUSE.cmake @@ -3,9 +3,12 @@ SET(MINGW_PREFIX "i686-w64-mingw32") # this one is important SET(CMAKE_SYSTEM_NAME Windows) + # specify the cross compiler SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc) +SET(CMAKE_C_FLAGS "-fno-keep-inline-dllexport") SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++) +SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres) # where is the target environment containing libraries @@ -15,9 +18,6 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - -# libs with broken find modules +# configure qt variables +SET(QT_LIBRARY_DIR /usr/${MINGW_PREFIX}/bin) SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/) -SET(QT_QTUITOOLS_LIBRARY_RELEASE ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a) -SET(QT_QTUITOOLS_LIBRARY_DEBUG ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a) -SET(QT_QTUITOOLS_LIBRARY ${QT_QTUITOOLS_LIBRARY_RELEASE}) \ No newline at end of file diff --git a/admin/win/update-vlc.sh b/admin/win/update-vlc.sh index e3035280d..685aa8c42 100644 --- a/admin/win/update-vlc.sh +++ b/admin/win/update-vlc.sh @@ -1,51 +1,52 @@ #!/bin/bash -mkdir -p vlc/ if [ "$1" = "-c" ] ; then echo "Continuing last download.." -rm -rvf vlc/prefix/ +rm -rvf vlc/ else -echo "Remove old vlc dir..." -rm -rvf vlc/* +echo "Update archive..." fi -cd vlc/ +rm -rvf vlc/ + echo "Download phonon archive..." -#wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb" -#wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip" -#wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z -wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z +# wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb" +# wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip" +# wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z +# wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z +wget -c http://download.tomahawk-player.org/test/pvlc.tar.bz2 echo "Extract binary..." -7z x phonon*.7z -#mv -v vlc-*/ vlc/ -#unzip tomahawk-vlc-0.1.zip +# 7z x phonon*.7z +# mv -v vlc-*/ vlc/ +# unzip tomahawk-vlc-0.1.zip +tar xvjf pvlc.tar.bz2 -echo "Download phonon_vlc_no_video.dll..." -wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll -cp -v phonon_vlc_no_video.dll prefix/bin/phonon_backend/phonon_vlc.dll +# echo "Download phonon_vlc_no_video.dll..." +# wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll +# cp -v phonon_vlc_no_video.dll prefix/bin/phonon_backend/phonon_vlc.dll -echo "Strip unneeded plugins from vlc/plugins..." -cd prefix/bin/plugins -rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \ - libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \ - *qt4* *skins2* libaccess_bd_plugin.dll \ - libaudiobargraph_* libball_plugin.dll \ - libdirac_plugin.dll \ - libgnutls_plugin.dll \ - libcaca_plugin.dll \ - libfreetype_plugin.dll \ - libaccess_output_shout_plugin.dll \ - libremoteosd_plugin.dll \ - libsdl_image_plugin.dll \ - libvout_sdl_plugin.dll \ - libpng_plugin.dll \ - libgoom_plugin.dll \ - libatmo_plugin.dll \ - libmux_ts_plugin.dll \ - libkate_plugin.dll \ - libtaglib_plugin.dll +# echo "Strip unneeded plugins from vlc/plugins..." +# cd prefix/bin/plugins +# rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \ +# libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \ +# *qt4* *skins2* libaccess_bd_plugin.dll \ +# libaudiobargraph_* libball_plugin.dll \ +# libdirac_plugin.dll \ +# libgnutls_plugin.dll \ +# libcaca_plugin.dll \ +# libfreetype_plugin.dll \ +# libaccess_output_shout_plugin.dll \ +# libremoteosd_plugin.dll \ +# libsdl_image_plugin.dll \ +# libvout_sdl_plugin.dll \ +# libpng_plugin.dll \ +# libgoom_plugin.dll \ +# libatmo_plugin.dll \ +# libmux_ts_plugin.dll \ +# libkate_plugin.dll \ +# libtaglib_plugin.dll # this is for vlc-1.2 diff --git a/src/breakpad/CrashReporter/CMakeLists.txt b/src/breakpad/CrashReporter/CMakeLists.txt index d1944bfcc..a1a2a0d47 100644 --- a/src/breakpad/CrashReporter/CMakeLists.txt +++ b/src/breakpad/CrashReporter/CMakeLists.txt @@ -21,5 +21,4 @@ ADD_DEFINITIONS( ${QT_DEFINITIONS} ) ADD_EXECUTABLE( tomahawk_crash_reporter WIN32 ${crashreporter_SOURCES} ${crashreporter_HEADERS_MOC} ${crashreporter_UI_HEADERS} ${crashreporter_RC_RCC} ) TARGET_LINK_LIBRARIES( tomahawk_crash_reporter ${QT_LIBRARIES} tomahawklib ) -INCLUDE(GNUInstallDirs) -install(TARGETS tomahawk_crash_reporter RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}) +install(TARGETS tomahawk_crash_reporter RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 9af7daf0c..f443458ef 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -714,6 +714,7 @@ TARGET_LINK_LIBRARIES( tomahawklib ${QT_QTSQL_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} + ${QT_QTSCRIPT_LIBRARY} ${OS_SPECIFIC_LINK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${LINK_LIBRARIES}