diff options
| author |  Robert Förster | 2012-09-17 17:21:00 +0000 |
|---|---|---|
| committer | Robert Förster | 2012-09-17 17:21:00 +0000 |
| commit | a66dd1c37a43900619b81e2070d742b1d0384452 (patch) | |
| tree | f1bfb051b94f5e1a1493d3abe239618ad2d2aa79 /src/modules | |
| parent | INSTALL: Point out that qt development package is needed (diff) | |
| download | KVIrc-a66dd1c37a43900619b81e2070d742b1d0384452.tar.gz KVIrc-a66dd1c37a43900619b81e2070d742b1d0384452.tar.bz2 KVIrc-a66dd1c37a43900619b81e2070d742b1d0384452.zip | |
- remove -mwindows from linker step, WIN32 flag in kvirc subdir deals with this already
- add /Zc:wchar_t- to base CMakeLists.txt file, it doesn't seem to have a negative impact and qt4.x is compiled with it
NB: *something* adds /LTCG *somewhere*, which overrides /INCREMENTAL. i need to find out what it is :|
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6249 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/mediaplayer/CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt index 20bb7e849..84acc063f 100644 --- a/src/modules/mediaplayer/CMakeLists.txt +++ b/src/modules/mediaplayer/CMakeLists.txt @@ -18,13 +18,9 @@ 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) + IF(MINGW) + SET_TARGET_PROPERTIES(gen_kvirc PROPERTIES PREFIX "" LINK_FLAGS -static-libgcc COMPILE_FLAGS -static-libgcc) + ENDIF() INSTALL(TARGETS gen_kvirc LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/modules) ENDIF() |