diff --git a/src/libtomahawk/utils/Logger.cpp b/src/libtomahawk/utils/Logger.cpp index 80b01236f..98c8b1c40 100644 --- a/src/libtomahawk/utils/Logger.cpp +++ b/src/libtomahawk/utils/Logger.cpp @@ -188,7 +188,7 @@ setupLogfile( QFile& f ) } } -#ifdef _WIN32 +#ifdef OFSTREAM_CAN_OPEN_WCHAR_FILE_NAMES // this is not supported in upstream libstdc++ as shipped with GCC // GCC needs the patch from https://gcc.gnu.org/ml/libstdc++/2011-06/msg00066.html applied // we could create a CMake check like the one for taglib, but I don't care right now :P diff --git a/src/tomahawk/CMakeLists.win32.cmake b/src/tomahawk/CMakeLists.win32.cmake index b7a2e2a78..3e5b96483 100644 --- a/src/tomahawk/CMakeLists.win32.cmake +++ b/src/tomahawk/CMakeLists.win32.cmake @@ -1,5 +1,5 @@ -ADD_DEFINITIONS( /DNOMINMAX ) -ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN ) +ADD_DEFINITIONS( -DNOMINMAX ) +ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN ) ADD_DEFINITIONS( -static-libgcc ) ADD_DEFINITIONS( -DUNICODE ) @@ -21,3 +21,13 @@ SET( OS_SPECIFIC_LINK_LIBRARIES if(QTSPARKLE_FOUND) list(APPEND OS_SPECIFIC_LINK_LIBRARIES ${QTSPARKLE_LIBRARIES}) endif() + + +include(CheckCXXSourceCompiles) + +check_cxx_source_compiles( "#include + int main(){ + ofstream stream(L\"Test\"); + return 0; + }" + OFSTREAM_CAN_OPEN_WCHAR_FILE_NAMES) \ No newline at end of file diff --git a/src/tomahawk/Config.h.in b/src/tomahawk/Config.h.in index 467354fdb..f3c180713 100644 --- a/src/tomahawk/Config.h.in +++ b/src/tomahawk/Config.h.in @@ -27,4 +27,6 @@ #cmakedefine HAVE_VLC_ALBUMARTIST #cmakedefine HAVE_X11 +#cmakedefine OFSTREAM_CAN_OPEN_WCHAR_FILE_NAMES + #endif // CONFIG_H_IN