From 4907a23feafc0a036ea6477393cf7d7c7e5c36f5 Mon Sep 17 00:00:00 2001 From: Egor Pugin Date: Sat, 15 Jul 2017 15:09:00 +0300 Subject: [PATCH] Fix windows build. --- cppan.yml | 7 +++++++ training/CMakeLists.txt | 9 +++++++++ training/pango_font_info.cpp | 10 ++++++++++ 3 files changed, 26 insertions(+) diff --git a/cppan.yml b/cppan.yml index 543f0f3157..977bb7e87b 100644 --- a/cppan.yml +++ b/cppan.yml @@ -219,10 +219,17 @@ projects: - training/lstmtester.* - training/normstrngs.* - training/unicharset_training_utils.* + - training/validat.* include_directories: training dependencies: - common_training - pvt.cppan.demo.unicode.icu.i18n + options: + any: + link_libraries: + win32: + private: + - Shlwapi lstmeval: files: training/lstmeval.cpp diff --git a/training/CMakeLists.txt b/training/CMakeLists.txt index 1d865bb15d..27cb469f84 100644 --- a/training/CMakeLists.txt +++ b/training/CMakeLists.txt @@ -183,6 +183,12 @@ set(unicharset_training_src normstrngs.h unicharset_training_utils.cpp unicharset_training_utils.h + + validate_grapheme.h validate_indic.h validate_khmer.h + validate_myanmar.h validator.h + validate_grapheme.cpp validate_indic.cpp validate_khmer.cpp + validate_myanmar.cpp validator.cpp + ) add_library (unicharset_training ${unicharset_training_src}) if (NOT CPPAN_BUILD) @@ -190,6 +196,9 @@ target_link_libraries (unicharset_training common_training ${ICU_LIBRARIES else() target_link_libraries (unicharset_training common_training pvt.cppan.demo.unicode.icu.i18n) endif() +if (WIN32) +target_link_libraries (unicharset_training Shlwapi) +endif() project_group (unicharset_training "Training Tools") diff --git a/training/pango_font_info.cpp b/training/pango_font_info.cpp index 07d9077717..48e4d77dac 100644 --- a/training/pango_font_info.cpp +++ b/training/pango_font_info.cpp @@ -46,6 +46,16 @@ #include "pango/pangocairo.h" #include "pango/pangofc-font.h" +#ifdef _MSC_VER +#ifndef strcasecmp +#define strcasecmp stricmp +#endif +#include +#ifndef strcasestr +#define strcasestr StrStrIA +#endif +#endif + STRING_PARAM_FLAG(fontconfig_tmpdir, "/tmp", "Overrides fontconfig default temporary dir");