Skip to content

Commit 4907a23

Browse files
committed
Fix windows build.
1 parent dc8745e commit 4907a23

File tree

3 files changed

+26
-0
lines changed

3 files changed

+26
-0
lines changed

cppan.yml

+7
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,17 @@ projects:
219219
- training/lstmtester.*
220220
- training/normstrngs.*
221221
- training/unicharset_training_utils.*
222+
- training/validat.*
222223
include_directories: training
223224
dependencies:
224225
- common_training
225226
- pvt.cppan.demo.unicode.icu.i18n
227+
options:
228+
any:
229+
link_libraries:
230+
win32:
231+
private:
232+
- Shlwapi
226233

227234
lstmeval:
228235
files: training/lstmeval.cpp

training/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,22 @@ set(unicharset_training_src
183183
normstrngs.h
184184
unicharset_training_utils.cpp
185185
unicharset_training_utils.h
186+
187+
validate_grapheme.h validate_indic.h validate_khmer.h
188+
validate_myanmar.h validator.h
189+
validate_grapheme.cpp validate_indic.cpp validate_khmer.cpp
190+
validate_myanmar.cpp validator.cpp
191+
186192
)
187193
add_library (unicharset_training ${unicharset_training_src})
188194
if (NOT CPPAN_BUILD)
189195
target_link_libraries (unicharset_training common_training ${ICU_LIBRARIES})
190196
else()
191197
target_link_libraries (unicharset_training common_training pvt.cppan.demo.unicode.icu.i18n)
192198
endif()
199+
if (WIN32)
200+
target_link_libraries (unicharset_training Shlwapi)
201+
endif()
193202
project_group (unicharset_training "Training Tools")
194203

195204

training/pango_font_info.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@
4646
#include "pango/pangocairo.h"
4747
#include "pango/pangofc-font.h"
4848

49+
#ifdef _MSC_VER
50+
#ifndef strcasecmp
51+
#define strcasecmp stricmp
52+
#endif
53+
#include <Shlwapi.h>
54+
#ifndef strcasestr
55+
#define strcasestr StrStrIA
56+
#endif
57+
#endif
58+
4959
STRING_PARAM_FLAG(fontconfig_tmpdir, "/tmp",
5060
"Overrides fontconfig default temporary dir");
5161

0 commit comments

Comments
 (0)