File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed
Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 5353 <WarningLevel >Level3</WarningLevel >
5454 <Optimization >Disabled</Optimization >
5555 <PreprocessorDefinitions >HAVE_CLD2;HAVE_HTTP_CLIENT;XML_STATIC;_NO_ASYNCRTIMP;WIN32;_DEBUG;DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions >
56- <AdditionalIncludeDirectories >src;deps\custom_build\config;deps\wx\include;deps\boost;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories >
56+ <AdditionalIncludeDirectories >src;deps\custom_build\config;deps\wx\include;deps\boost;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\dtl;deps\ icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories >
5757 <MultiProcessorCompilation >true</MultiProcessorCompilation >
5858 <MinimalRebuild >false</MinimalRebuild >
5959 <DisableSpecificWarnings >4800</DisableSpecificWarnings >
8383 <FunctionLevelLinking >true</FunctionLevelLinking >
8484 <IntrinsicFunctions >true</IntrinsicFunctions >
8585 <PreprocessorDefinitions >HAVE_CLD2;HAVE_HTTP_CLIENT;XML_STATIC;_NO_ASYNCRTIMP;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions >
86- <AdditionalIncludeDirectories >src;deps\custom_build\config;deps\wx\include;deps\boost;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories >
86+ <AdditionalIncludeDirectories >src;deps\custom_build\config;deps\wx\include;deps\boost;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\dtl;deps\ icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories >
8787 <MultiProcessorCompilation >true</MultiProcessorCompilation >
8888 <DisableSpecificWarnings >4800</DisableSpecificWarnings >
8989 <PrecompiledHeaderFile >Poedit-Prefix.pch</PrecompiledHeaderFile >
Original file line number Diff line number Diff line change 17991799 deps/lucene,
18001800 deps/lucene/LucenePlusPlus/include,
18011801 deps/cld2,
1802+ deps/dtl,
18021803 "$(DEPS_BUILD_DIR)/icu/include",
18031804 );
18041805 LIBRARY_SEARCH_PATHS = "$(DEPS_BUILD_DIR)/icu/lib";
18721873 deps/lucene,
18731874 deps/lucene/LucenePlusPlus/include,
18741875 deps/cld2,
1876+ deps/dtl,
18751877 "$(DEPS_BUILD_DIR)/icu/include",
18761878 );
18771879 LIBRARY_SEARCH_PATHS = "$(DEPS_BUILD_DIR)/icu/lib";
Original file line number Diff line number Diff line change @@ -132,7 +132,7 @@ Diff::Action dtl2DiffAction(dtl::edit_t lastType) {
132132
133133Diff::Diff (const wxString& from, const wxString& to) {
134134 // Do the diff
135- dtl::Diff<wxUniChar , wxString> d (from, to);
135+ dtl::Diff<wchar_t , wxString> d (from, to);
136136 d.compose ();
137137 auto dtlSeq = d.getSes ().getSequence ();
138138
You can’t perform that action at this time.
0 commit comments