diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 3876594..47ec282 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -19,17 +19,17 @@ * with this program; If not, see . ***************************************************************************/ -//update time 2021.10.27 -#define OCR_VERSION_STR "2.3.1.0" -#define OCR_VERSION_WSTR L"2.3.1.0" -#define OCR_VER_TIME_STR "(2021/10/27)" +//update time 2022.01.29 +#define OCR_VERSION_STR "2.4.0.0" +#define OCR_VERSION_WSTR L"2.4.0.0" +#define OCR_VER_TIME_STR "(2022/01/29)" #define OCR_MAJOR_VERSION 2 -#define OCR_MIDLE_VERSION 3 -#define OCR_MINOR_VERSION 1 +#define OCR_MIDLE_VERSION 4 +#define OCR_MINOR_VERSION 0 #define OCR_PATCH_VERSION 0 -#define OCR_VERSION 0x02310 +#define OCR_VERSION 0x02400 #define TTK_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch)) diff --git a/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc index 1ea4ff5..cc15d3d 100644 --- a/TTKModule/TTKCore.rc +++ b/TTKModule/TTKCore.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,1,0 - PRODUCTVERSION 2,3,1,0 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky studio, Ltd." VALUE "FileDescription", "TTKCore" - VALUE "FileVersion", "2.3.1.0" + VALUE "FileVersion", "2.4.0.0" VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022" VALUE "ProductName", "TTKCore" - VALUE "ProductVersion", "2.3.1.0" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKResource/A_extras/TTKRoutine.sh b/TTKResource/A_extras/TTKRoutine.sh index 7ca58ab..6a786be 100755 --- a/TTKResource/A_extras/TTKRoutine.sh +++ b/TTKResource/A_extras/TTKRoutine.sh @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then fi LD_LIBRARY_PATH=$dirpath -export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.3.1.0:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.4.0.0:$LD_LIBRARY_PATH export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH $appname "$@" diff --git a/TTKRun/TTKApp/TTKApp.rc b/TTKRun/TTKApp/TTKApp.rc index 521af2b..da85d35 100644 --- a/TTKRun/TTKApp/TTKApp.rc +++ b/TTKRun/TTKApp/TTKApp.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_app_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,1,0 - PRODUCTVERSION 2,3,1,0 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,12 +27,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky studio, Ltd." VALUE "FileDescription", "TTKOCR" - VALUE "FileVersion", "2.3.1.0" + VALUE "FileVersion", "2.4.0.0" VALUE "InternalName", "TTKOCR.exe" VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022" VALUE "OriginalFilename", "TTKOCR.exe" VALUE "ProductName", "TTKOCR" - VALUE "ProductVersion", "2.3.1.0" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKService/TTKService.rc b/TTKService/TTKService.rc index da76818..cf5ff8d 100644 --- a/TTKService/TTKService.rc +++ b/TTKService/TTKService.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,1,0 - PRODUCTVERSION 2,3,1,0 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,12 +27,12 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky studio, Ltd." VALUE "FileDescription", "TTKService" - VALUE "FileVersion", "2.3.1.0" + VALUE "FileVersion", "2.4.0.0" VALUE "InternalName", "TTKService.exe" VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022" VALUE "OriginalFilename", "TTKService.exe" VALUE "ProductName", "TTKService" - VALUE "ProductVersion", "2.3.1.0" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKThirdParty/TTKExtras/TTKExtras.rc b/TTKThirdParty/TTKExtras/TTKExtras.rc index 9e0840b..f7d7c02 100644 --- a/TTKThirdParty/TTKExtras/TTKExtras.rc +++ b/TTKThirdParty/TTKExtras/TTKExtras.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,1,0 - PRODUCTVERSION 2,3,1,0 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky studio, Ltd." VALUE "FileDescription", "TTKExtras" - VALUE "FileVersion", "2.3.1.0" + VALUE "FileVersion", "2.4.0.0" VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022" VALUE "ProductName", "TTKExtras" - VALUE "ProductVersion", "2.3.1.0" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKUi/TTKUi.rc b/TTKUi/TTKUi.rc index 6f36557..fd610bb 100644 --- a/TTKUi/TTKUi.rc +++ b/TTKUi/TTKUi.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,1,0 - PRODUCTVERSION 2,3,1,0 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -25,10 +25,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky studio, Ltd." VALUE "FileDescription", "TTKUi" - VALUE "FileVersion", "2.3.1.0" + VALUE "FileVersion", "2.4.0.0" VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022" VALUE "ProductName", "TTKUi" - VALUE "ProductVersion", "2.3.1.0" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKVersion.pri b/TTKVersion.pri index 1fae084..be1c255 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc OBJECTS_DIR = ./.build/obj RCC_DIR = ./.build/rcc -# update time 2021.10.27 -TTKOCR = 2.3.1.0 +# update time 2022.01.29 +TTKOCR = 2.4.0.0