diff --git a/PowerEditor/gcc/makefile b/PowerEditor/gcc/makefile index 4f0ce59ff..c97ced4d0 100644 --- a/PowerEditor/gcc/makefile +++ b/PowerEditor/gcc/makefile @@ -60,7 +60,7 @@ else BUILD_TYPE := debug BUILD_SUFFIX := -debug CXXFLAGS += -Og -g -Wall -Wpedantic -Wconversion-null -#CPP_DEFINE += DEBUG +CPP_DEFINE += DEBUG endif # diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp index 8a091ad1f..a9abe7b4a 100644 --- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp +++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp @@ -706,7 +706,11 @@ bool PluginsAdminDlg::initFromJson() #ifdef DEBUG // if not debug, then it's release // load from nppPluginList.json instead of nppPluginList.dll +#ifdef __MINGW32__ + ifstream nppPluginListJson(wstring2string(_pluginListFullPath, CP_UTF8)); +#else // MSVC supports UTF-16 path names in file stream constructors ifstream nppPluginListJson(_pluginListFullPath); +#endif nppPluginListJson >> j; #else //RELEASE diff --git a/appveyor.yml b/appveyor.yml index 0eadd6752..d0e94be2d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,11 +27,6 @@ configuration: - Release - Debug -matrix: - exclude: - - compiler: GCC - configuration: Debug - before_build: - ps: | Write-Output "Compiler : $env:compiler" @@ -98,6 +93,7 @@ for: only: - compiler: GCC install: + - if "%configuration%" EQU "Debug" set DEBUG=1 - if "%platform%" EQU "i686" set PATH=C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;%PATH:C:\Program Files\Git\usr\bin;=% - if "%platform%" EQU "x86_64" set PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin;=% build_script: