diff --git a/CMakeLists.txt b/CMakeLists.txt index 764ec3bd..df457c58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0.0) -project(win-vind VERSION 3.0.1) +project(win-vind VERSION 3.0.2) if(NOT BIT_TYPE) set(BIT_TYPE 64) diff --git a/build_resources/resource.rc b/build_resources/resource.rc index ba019fe7..e785493f 100644 --- a/build_resources/resource.rc +++ b/build_resources/resource.rc @@ -3,7 +3,7 @@ IDI_ICON1 ICON DISCARDABLE "icon512.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 3,0,1 +FILEVERSION 3,0,2 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS VS_FF_PRERELEASE FILEOS VOS_NT_WINDOWS32 @@ -14,12 +14,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "pit-ray\0" - VALUE "FileDescription", "win-vind (64-bit)\0" + VALUE "FileDescription", "win-vind (32-bit)\0" VALUE "LegalCopyright", "Copyright (c) 2020 pit-ray\0" - VALUE "InternalName", "win-vind (64-bit)\0" + VALUE "InternalName", "win-vind (32-bit)\0" VALUE "OriginalFilename", "win-vind.exe\0" - VALUE "ProductName", "win-vind (64bit)\0" - VALUE "ProductVersion", "3.0.1\0" + VALUE "ProductName", "win-vind (32bit)\0" + VALUE "ProductVersion", "3.0.2\0" END END BLOCK "VarFileInfo" diff --git a/create_bin.bat b/create_bin.bat index 0bbfe723..5ed3ea05 100644 --- a/create_bin.bat +++ b/create_bin.bat @@ -41,30 +41,18 @@ powershell Compress-Archive -Path ".\\bin\\setup_win-vind_%1_32bit.exe" -Destina @echo Create Zip Version ---------------------------------------------------------- echo n> ".\\default_config\\is_installer_used" -mkdir ".\\bin\\win-vind_64bit" -mkdir ".\\bin\\win-vind_64bit\\config" -mkdir ".\\bin\\win-vind_64bit\\default_config" -mkdir ".\\bin\\win-vind_64bit\\log" -mkdir ".\\bin\\win-vind_64bit\\resources" - -copy ".\\release_64\\win-vind.exe" ".\\bin\\win-vind_64bit\\win-vind.exe" -xcopy /e /Y ".\\config" ".\\bin\\win-vind_64bit\\config" -xcopy /e /Y ".\\default_config" ".\\bin\\win-vind_64bit\\default_config" -xcopy /e /Y ".\\log" ".\\bin\\win-vind_64bit\\log" -xcopy /e /Y ".\\resources" ".\\bin\\win-vind_64bit\\resources" - -powershell Compress-Archive -Path ".\\bin\\win-vind_64bit" -DestinationPath ".\\bin\\win-vind_%1_64bit".zip" - -mkdir ".\\bin\\win-vind_32bit" -mkdir ".\\bin\\win-vind_32bit\\config" -mkdir ".\\bin\\win-vind_32bit\\default_config" -mkdir ".\\bin\\win-vind_32bit\\log" -mkdir ".\\bin\\win-vind_32bit\\resources" - -copy ".\\release_32\\win-vind.exe" ".\\bin\\win-vind_32bit\\win-vind.exe" -xcopy /e /Y ".\\config" ".\\bin\\win-vind_32bit\\config" -xcopy /e /Y ".\\default_config" ".\\bin\\win-vind_32bit\\default_config" -xcopy /e /Y ".\\log" ".\\bin\\win-vind_32bit\\log" -xcopy /e /Y ".\\resources" ".\\bin\\win-vind_32bit\\resources" - -powershell Compress-Archive -Path ".\\bin\\win-vind_32bit" -DestinationPath ".\\bin\\win-vind_%1_32bit.zip" +mkdir ".\\bin\\win-vind" +mkdir ".\\bin\\win-vind\\config" +mkdir ".\\bin\\win-vind\\default_config" +mkdir ".\\bin\\win-vind\\log" +mkdir ".\\bin\\win-vind\\resources" + +copy /Y ".\\release_64\\win-vind.exe" ".\\bin\\win-vind\\win-vind.exe" +xcopy /e /Y ".\\config" ".\\bin\\win-vind\\config" +xcopy /e /Y ".\\default_config" ".\\bin\\win-vind\\default_config" +xcopy /e /Y ".\\log" ".\\bin\\win-vind\\log" +xcopy /e /Y ".\\resources" ".\\bin\\win-vind\\resources" +powershell Compress-Archive -Path ".\\bin\\win-vind" -DestinationPath ".\\bin\\win-vind_%1_64bit".zip" + +copy /Y ".\\release_32\\win-vind.exe" ".\\bin\\win-vind\\win-vind.exe" +powershell Compress-Archive -Path ".\\bin\\win-vind" -DestinationPath ".\\bin\\win-vind_%1_32bit.zip" diff --git a/log/error.log b/log/error.log index 6aaf3e5f..e69de29b 100644 --- a/log/error.log +++ b/log/error.log @@ -1,3 +0,0 @@ -[Error] Windows Error Code: [0], 0 0 ` is not supported in "config\US.kmp", L2. (JumpCursorUtility::load_config():: [with auto:1 = const char*]) -[Error] Windows Error Code: [0], 12 0 = is not supported in "config\US.kmp", L14. (JumpCursorUtility::load_config():: [with auto:1 = const char*]) -[Error] Windows Error Code: [0], 11.75 2 ' is not supported in "config\US.kmp", L43. (JumpCursorUtility::load_config():: [with auto:1 = const char*]) diff --git a/wxgui/include/version.hpp b/wxgui/include/version.hpp index 647ff7fe..6594a1a3 100644 --- a/wxgui/include/version.hpp +++ b/wxgui/include/version.hpp @@ -1 +1 @@ -#define WIN_VIND_VERSION "3.0.1" +#define WIN_VIND_VERSION "3.0.2"