From 845f5e3c51809ec4967fd4940985b221c3918e95 Mon Sep 17 00:00:00 2001 From: Aleksey Chernov Date: Sat, 13 May 2017 19:14:55 +0000 Subject: bootstrap: fix build on mingw-w64 Define the default code page for EncodingCXX too. --- bootstrap | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap b/bootstrap index 8063edb..b1528cb 100755 --- a/bootstrap +++ b/bootstrap @@ -1419,6 +1419,7 @@ fi cmake_c_flags_String="-DKWSYS_STRING_C" if ${cmake_system_mingw}; then cmake_c_flags_EncodingC="-DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP" + cmake_cxx_flags_EncodingCXX="${cmake_c_flags_EncodingC}" cmake_cxx_flags_cmProcessOutput="${cmake_c_flags_EncodingC}" fi cmake_cxx_flags_SystemTools=" -- cgit v0.12 From 9557b403f521d4f537bbedb9ba00836fb7ebb70c Mon Sep 17 00:00:00 2001 From: Aleksey Chernov Date: Sat, 13 May 2017 19:14:55 +0000 Subject: cmFileCommand: Fix build on mingw-w64 Include header needed for `CP_ACP`. --- Source/cmFileCommand.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 91cecb3..dc97e37 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -42,6 +42,10 @@ #include "cmFileLockResult.h" #endif +#if defined(_WIN32) +#include +#endif + class cmSystemToolsFileTime; // Table of permissions flags. -- cgit v0.12