diff options
| author |  wodim | 2011-05-16 21:35:44 +0000 |
|---|---|---|
| committer | wodim | 2011-05-16 21:35:44 +0000 |
| commit | fb625b13f742e71011306db11939a3e8069de8ca (patch) | |
| tree | 2dd870bc2d2113525127e530ebff8e632a7a3f86 /src | |
| parent | fix the fix (diff) | |
| download | KVIrc-fb625b13f742e71011306db11939a3e8069de8ca.tar.gz KVIrc-fb625b13f742e71011306db11939a3e8069de8ca.tar.bz2 KVIrc-fb625b13f742e71011306db11939a3e8069de8ca.zip | |
fix compilation under msvs
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5842 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/mediaplayer/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/mediaplayer/MpSpotifyInterface.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt index f63257ea0..20bb7e849 100644 --- a/src/modules/mediaplayer/CMakeLists.txt +++ b/src/modules/mediaplayer/CMakeLists.txt @@ -18,6 +18,12 @@ SET(kvi_module_name kvimediaplayer) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) IF(WIN32) + #dirty workaround for the QString::fromWCharArray() use in the spotify interface. + #TODO: put it in the CMakeLists.txt in / and see if it breaks something. + IF (MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:wchar_t-") + ENDIF() + ADD_LIBRARY(gen_kvirc MODULE winamp.cpp) SET_TARGET_PROPERTIES(gen_kvirc PROPERTIES PREFIX "" LINK_FLAGS -static-libgcc COMPILE_FLAGS -static-libgcc) INSTALL(TARGETS gen_kvirc LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/modules) diff --git a/src/modules/mediaplayer/MpSpotifyInterface.cpp b/src/modules/mediaplayer/MpSpotifyInterface.cpp index c675fe143..e7dadba64 100644 --- a/src/modules/mediaplayer/MpSpotifyInterface.cpp +++ b/src/modules/mediaplayer/MpSpotifyInterface.cpp @@ -81,6 +81,8 @@ QString KviSpotifyInterface::get_window_title() { return szReturn.replace(QString("Spotify - "), QString(""));
} else
szReturn = QString("");
+
+ return szReturn;
}
MpInterface::PlayerStatus KviSpotifyInterface::status() {
|