diff --git a/CMakeLists.txt b/CMakeLists.txt index ddf2dcf127..493535636e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) # building minizip. option(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON) -# Russian GOST and CYRILLIC patch -option(KICAD_CYRILLIC "enable/disable building using cyrillic (needs unicode) (default OFF)") +# Russian GOST patch option(wxUSE_UNICODE "enable/disable building unicode (default OFF)") option(KICAD_GOST "enable/disable building using GOST notation for multiple gates per package (default OFF)") @@ -43,10 +42,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG") endif(CMAKE_COMPILER_IS_GNUCXX) -if(KICAD_CYRILLIC) - add_definitions(-DKICAD_CYRILLIC) -endif(KICAD_CYRILLIC) - if(wxUSE_UNICODE) add_definitions(-DwxUSE_UNICODE) endif(wxUSE_UNICODE) diff --git a/INSTALL.txt b/INSTALL.txt index 0cf44899a8..0dd377d558 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -166,9 +166,6 @@ Build the "minizip" executable. Use OFF to disable it building. -DKICAD_PYTHON=ON Build the KiCad with Python support. --DKICAD_CYRILLIC=ON -Build the KiCad with cyrillic fonts support. - -DwxUSE_UNICODE=ON Require on locale utf8 for build the KiCad with cyrillic fonts support. diff --git a/common/drawtxt.cpp b/common/drawtxt.cpp index ae57a08b78..c6d3012989 100644 --- a/common/drawtxt.cpp +++ b/common/drawtxt.cpp @@ -106,22 +106,6 @@ int NegableTextLength( const wxString& aText ) */ static const char* GetHersheyShapeDescription( int AsciiCode ) { -#if defined(KICAD_CYRILLIC) - AsciiCode &= 0x7FF; - if( AsciiCode > 0x40F && AsciiCode < 0x450 ) // big small Cyr - { - return hershey_cyrillic[AsciiCode - 0x410]; - } - else if( AsciiCode == 0x401 ) - { - return hershey_cyrillic[0x5]; - } - else if( AsciiCode == 0x451 ) - { - return hershey_cyrillic[0x25]; - } -#endif - /* calculate font length */ int font_length_max = sizeof(newstroke_font)/sizeof(*newstroke_font); if ( AsciiCode >= (32 + font_length_max) ) diff --git a/include/hershey_fonts.h b/include/hershey_fonts.h index 947330ecef..7a37960759 100644 --- a/include/hershey_fonts.h +++ b/include/hershey_fonts.h @@ -37,6 +37,3 @@ #include "HersheySimplexRoman_sans_normal.h" -#if defined(KICAD_CYRILLIC) -#include "HersheyCyrillic.h" -#endif