diff options
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/setup/libkvisetup.cpp | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index f29915f11..f078798d1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,9 +1,7 @@ version: 0.0.0.0.1-branch-{branch}-build-{build} cache: - c:\deps -> .appveyor.yml - - c:\Strawberry -> .appveyor.yml - c:\spellcheck-dicts -> .appveyor.yml - - c:\ProgramData\chocolatey -> .appveyor.yml environment: matrix: - cmake_build_type: Debug diff --git a/CMakeLists.txt b/CMakeLists.txt index 299dadca8..f87c757e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,8 +240,8 @@ else() if(MSVC) # this is the equivalent of -O0 -g according to MSDN # QT4 has /Zc:wchar_t-, QT5 has /Zc:wchar_t - set(CMAKE_CXX_FLAGS "/Od /Zi /Zc:wchar_t /EHsc") - set(CMAKE_C_FLAGS "/Od /Zi /Zc:wchar_t /EHsc") + set(CMAKE_CXX_FLAGS "/Od /Zi /Zc:wchar_t /EHsc /W3") + set(CMAKE_C_FLAGS "/Od /Zi /Zc:wchar_t /EHsc /W3") else() set(CMAKE_CXX_FLAGS "-O0 -g") set(CMAKE_C_FLAGS "-O0 -g") @@ -999,7 +999,7 @@ endif() if(WIN32) # 0x0600 = Windows Vista - add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN) + add_definitions(-D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DWIN32_LEAN_AND_MEAN) endif() if(MINGW) diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index f7e77ce86..606ca9ac6 100644 --- a/src/modules/setup/libkvisetup.cpp +++ b/src/modules/setup/libkvisetup.cpp @@ -38,7 +38,7 @@ #include <QFile> // this will be chosen during the setup process -QString g_szChosenIncomingDirectory; +QString g_szChoosenIncomingDirectory; int g_iThemeToApply = THEME_APPLY_NONE; bool bNeedToApplyDefaults; unsigned int uPort; @@ -67,7 +67,7 @@ KVIMODULEEXPORTFUNC void setup_finish() { if(bNeedToApplyDefaults) { - KVI_OPTION_STRING(KviOption_stringIncomingPath) = g_szChosenIncomingDirectory; + KVI_OPTION_STRING(KviOption_stringIncomingPath) = g_szChoosenIncomingDirectory; // Reset the quit message and the real name... if they contain the KVIrc version // then probably the user hasn't even edited them. if(KVI_OPTION_STRING(KviOption_stringQuitMessage).indexOf("KVIrc", 0, Qt::CaseInsensitive) != -1) |