diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ff99d64..1cf9b88 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -40,8 +40,8 @@ jobs: INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}} ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 - ChineseChessControl_VERSION: "v2.0.10" - VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2 + ChineseChessControl_VERSION: "2.0.11" + VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d qt_modules: 'qtimageformats qtmultimedia qtscxml qtwebchannel qtwebsockets qtwebview' # Map the job outputs to step outputs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4479ba..18703ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: build env: artifact_path: artifact_path GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ChineseChessControl_VERSION: "v2.0.10" + ChineseChessControl_VERSION: "2.0.11" on: push: diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index 9952aff..b0eacbc 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -18,7 +18,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu - ChineseChessControl_VERSION: "v2.0.10" + ChineseChessControl_VERSION: "2.0.11" DOXYGEN_VERSION: 1.9.5 artifact_name: build_doxygen diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 39c1c0f..006aafe 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -32,10 +32,10 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_macos - ChineseChessControl_VERSION: "2.0.10" + ChineseChessControl_VERSION: "2.0.11" artifact_name: build_macos qt_modules: 'qtwebengine ${{ matrix.qt_modules }}' - VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2 + VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d # Map the job outputs to step outputs outputs: diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 935c3b1..03900bd 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -26,7 +26,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}\.cache\source TOOSL_DIR: ${{github.workspace}}\.cache\tools INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw - ChineseChessControl_VERSION: "v2.0.10" + ChineseChessControl_VERSION: "2.0.11" artifact_name: build_mingw # Map the job outputs to step outputs diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index eca4653..d5c21e2 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -45,8 +45,8 @@ jobs: CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}} VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}} - ChineseChessControl_VERSION: "v2.0.10" - VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2 + ChineseChessControl_VERSION: "2.0.11" + VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d qt_modules: 'qtwebengine ${{matrix.qt_modules}}' # Map the job outputs to step outputs @@ -173,7 +173,7 @@ jobs: cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=QtDevelopment cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=Development 7z a ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_Qt${{matrix.qt_version}}_Develop.zip %CD%\install_develop\. -# cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package + cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package - name: Update artifact if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version != '5.15.2' }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e6a0fb4..b062bd5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -21,7 +21,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu_${{matrix.BUILD_TYPE}} - ChineseChessControl_VERSION: "2.0.10" + ChineseChessControl_VERSION: "2.0.11" artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/.travis.yml b/.travis.yml index 5b74901..1d95680 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ before_install: - sudo Xvfb :99 -ac & - export DISPLAY=:99.0 - mkdir ${SOURCE_DIR}/Tools -- export VERSION="v2.0.10" +- export VERSION="2.0.11" - echo "QT_USER:$QT_USER" - echo "QT_PASSWORD:$QT_PASSWORD" - echo "STOREPASS:$STOREPASS" diff --git a/App/MFC/ChineseChessMFC/CMakeLists.txt b/App/MFC/ChineseChessMFC/CMakeLists.txt index 9466160..bada1a4 100644 --- a/App/MFC/ChineseChessMFC/CMakeLists.txt +++ b/App/MFC/ChineseChessMFC/CMakeLists.txt @@ -67,6 +67,7 @@ if(CMAKE_MFC_FLAG EQUAL 2) target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXDLL") endif() target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXEXT" "_WINDLL" + "WIN32" "_WINDOWS" "_UNICODE" "UNICODE" $<$:_DEBUG DEBUG> ) diff --git a/App/Qt/ChineseChess/android/AndroidManifest.xml b/App/Qt/ChineseChess/android/AndroidManifest.xml index dc5f2dd..4553757 100644 --- a/App/Qt/ChineseChess/android/AndroidManifest.xml +++ b/App/Qt/ChineseChess/android/AndroidManifest.xml @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index edac10e..f7d4e5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ if(POLICY CMP0021) endif() # 设置版本号 -SET(ChineseChessControl_VERSION "v2.0.10") +SET(ChineseChessControl_VERSION "2.0.11") # 用 GIT 得到版本号 IF(EXISTS "${CMAKE_SOURCE_DIR}/.git") if(NOT GIT) diff --git a/ChangeLog.md b/ChangeLog.md index edbb681..b59da31 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +- v2.0.11 + + CI: 更新 VCPKG。修复CPAKE错误。详见: https://github.com/microsoft/vcpkg/issues/32560 + - v2.0.10 + 用 QFileDialog::getOpenFileName 替换 RabbitCommon::CDir::GetOpenFileName + 用 QFileDialog::getSaveFileName 替换 RabbitCommon::CDir::GetSaveFileName @@ -81,7 +84,7 @@ - v1.1.0 + 重构程序 - 按[象棋竞赛规则(2011)](Documents/ChineseChessRule2011.pdf)重构棋盘布局 - + 优化程序算可读性 + + 优化程序可读性 + 优化算法性能 - v1.0.2 diff --git a/Install/Install.nsi b/Install/Install.nsi index 7eed305..e91f5eb 100644 --- a/Install/Install.nsi +++ b/Install/Install.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "ChineseChessControl" -!define PRODUCT_VERSION "v2.0.10" +!define PRODUCT_VERSION "2.0.11" !define PRODUCT_PUBLISHER "Kang Lin (kl222@126.com)" !define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe" diff --git a/README.md b/README.md index f3fb188..6a42c7e 100644 --- a/README.md +++ b/README.md @@ -78,62 +78,68 @@ + [最后版本](https://github.com/KangLin/ChineseChessControl/releases/latest) + 当前版本: - Windows安装包,支持 Windows 7 以上系统。 - - ChineseChessControl_v2.0.10_msvc1929_x86_64_Setup.exe - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_msvc1929_x86_64_Setup.exe) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_msvc1929_x86_64_Setup.exe/download) - - ChineseChessControl_v2.0.10_msvc1916_x86_Setup.exe - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_msvc1916_x86_Setup.exe) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_msvc1916_x86_Setup.exe/download) + - chinesechesscontrol_v2.0.1_Windows_x64_setup.exe + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Windows_x64_setup.exe) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Windows_x64_setup.exe/download) + - chinesechesscontrol_v2.0.11_Windows_X86_setup.exe + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Windows_X86_setup.exe) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Windows_X86_setup.exe/download) + - ChineseChessControl_v2.0.11_msvc1929_x86_64_Setup.exe + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_msvc1929_x86_64_Setup.exe) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_msvc1929_x86_64_Setup.exe/download) + - ChineseChessControl_v2.0.11_msvc1916_x86_Setup.exe + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_msvc1916_x86_Setup.exe) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_msvc1916_x86_Setup.exe/download) - Windows开发包,安装完成后,使用请详见:[开发者文档](Documents/Developer.md#调试) - - ChineseChessControl_v2.0.10_win32_msvc2017_Qt5.12.12_Develop.zip - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_win32_msvc2017_Qt5.12.12_Develop.zip) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_win32_msvc2017_Qt5.12.12_Develop.zip/download) - - ChineseChessControl_v2.0.10_win64_msvc2019_64_qt6.5.1_Develop.zip - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_win64_msvc2019_64_qt6.5.1_Develop.zip) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_win64_msvc2019_64_Qt6.5.1_Develop.zip/download) + - ChineseChessControl_v2.0.11_win32_msvc2017_Qt5.12.12_Develop.zip + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_win32_msvc2017_Qt5.12.12_Develop.zip) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_win32_msvc2017_Qt5.12.12_Develop.zip/download) + - ChineseChessControl_v2.0.11_win64_msvc2019_64_qt6.5.1_Develop.zip + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_win64_msvc2019_64_qt6.5.1_Develop.zip) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_win64_msvc2019_64_Qt6.5.1_Develop.zip/download) - linux - - chinesechesscontrol_v2.0.10_Linux_x86_64_setup.sh - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.sh) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.sh/download) + - chinesechesscontrol_v2.0.11_Linux_x86_64_setup.sh + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.sh) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.sh/download) - ubuntu - - chinesechesscontrol_v2.0.10_Linux_x86_64_setup.deb - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.deb) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.deb/download) + - chinesechesscontrol_v2.0.11_Linux_x86_64_setup.deb + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.deb) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.deb/download) - Macos - - chinesechesscontrol_v2.0.10_Darwin_x86_64_setup.tar.gz - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/chinesechesscontrol_v2.0.10_Darwin_x86_64_setup.tar.gz) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/chinesechesscontrol_v2.0.10_Darwin_x86_64_setup.tar.gz/download) + - chinesechesscontrol_v2.0.11_Darwin_x86_64_setup.tar.gz + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Darwin_x86_64_setup.tar.gz) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Darwin_x86_64_setup.tar.gz/download) - Android - APK - - ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.apk - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.apk) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.apk/download) - - ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.apk - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.apk) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.apk/download) - - ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.apk - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.apk) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.apk/download) + - ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.apk + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.apk) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.apk/download) + - ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.apk + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.apk) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.apk/download) + - ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.apk + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.apk) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.apk/download) - 开发包 - - ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.zip - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.zip) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.zip/download) - - ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.zip - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.zip) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.zip/download) - - ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.zip - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.zip) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.zip/download) + - ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.zip + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.zip) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.zip/download) + - ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.zip + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.zip) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.zip/download) + - ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.zip + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.zip) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.zip/download) + 文档 - - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_document.zip) - - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_document.zip/download) + - [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_document.zip) + - [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_document.zip/download) + [在线文档](https://kanglin.github.io/ChineseChessControl/html/index.html) #### 贡献 diff --git a/UI/ActiveX/ChineseChessActiveXCtrl.cpp b/UI/ActiveX/ChineseChessActiveXCtrl.cpp index 39593ec..8938c58 100644 --- a/UI/ActiveX/ChineseChessActiveXCtrl.cpp +++ b/UI/ActiveX/ChineseChessActiveXCtrl.cpp @@ -64,7 +64,7 @@ END_PROPPAGEIDS(CChineseChessActiveXCtrl) // ʼ๤ guid -IMPLEMENT_OLECREATE_EX(CChineseChessActiveXCtrl, "ChineseChessActiveX.2.0.10", +IMPLEMENT_OLECREATE_EX(CChineseChessActiveXCtrl, "ChineseChessActiveX.2.0.11", 0xe4e060cb,0xa3aa,0x4278,0xb1,0xed,0xce,0x50,0x20,0xc4,0x2e,0xc7) // ID Ͱ汾 diff --git a/UI/ActiveX/ChineseChessActiveXPropPage.cpp b/UI/ActiveX/ChineseChessActiveXPropPage.cpp index 86042fd..d1a339e 100644 --- a/UI/ActiveX/ChineseChessActiveXPropPage.cpp +++ b/UI/ActiveX/ChineseChessActiveXPropPage.cpp @@ -17,7 +17,7 @@ END_MESSAGE_MAP() // ʼ๤ guid -IMPLEMENT_OLECREATE_EX(CChineseChessActiveXPropPage, "ChineseChessActiveXPropPage.2.0.10", +IMPLEMENT_OLECREATE_EX(CChineseChessActiveXPropPage, "ChineseChessActiveXPropPage.2.0.11", 0x035c7fb0,0x47a0,0x45fb,0xa4,0x5a,0xc2,0x9d,0xcf,0xe9,0xe0,0x01) // CChineseChessActiveXPropPage::CChineseChessActiveXPropPageFactory::UpdateRegistry - diff --git a/UI/MFC/CMakeLists.txt b/UI/MFC/CMakeLists.txt index fab01d5..37e52d5 100644 --- a/UI/MFC/CMakeLists.txt +++ b/UI/MFC/CMakeLists.txt @@ -67,6 +67,7 @@ if(CMAKE_MFC_FLAG EQUAL 2) target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXDLL") endif() target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXEXT" "_WINDLL" + "WIN32" "_WINDOWS" "_UNICODE" "UNICODE" $<$:_DEBUG DEBUG> ) diff --git a/appveyor.yml b/appveyor.yml index 7b75a4e..f54f0ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 'v2.0.10.{build}' +version: '2.0.11.{build}' cache: - Package @@ -10,7 +10,7 @@ environment: secure: EoBPaPuJ6u9UDYpQWjKhUg== QT_PASSWORD: secure: ejAYGgB+3sBispRxUSr0xw== - ChineseChessControl_VERSION: "v2.0.10" + ChineseChessControl_VERSION: "2.0.11" matrix: ##### msvc 2019 ######## diff --git a/ci/build.sh b/ci/build.sh index 0b08451..125a4d7 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -140,12 +140,12 @@ case ${BUILD_TARGERT} in esac if [ -n "$appveyor_build_version" -a -z "$VERSION" ]; then - export VERSION="v2.0.10" + export VERSION="2.0.11" fi if [ -z "$VERSION" ]; then - export VERSION="v2.0.10" + export VERSION="2.0.11" fi -export DEBIAN_VERSION="2.0.10" +export DEBIAN_VERSION="2.0.11" export UPLOADTOOL_BODY="Release ChineseChess ${VERSION}.
The change see [ChangeLog.md](ChangeLog.md)" #export UPLOADTOOL_PR_BODY= diff --git a/debian/changelog b/debian/changelog index 063a1cc..bee8745 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -chinesechess (2.0.10) stable; urgency=medium +chinesechess (2.0.11) stable; urgency=medium * Initial Release. diff --git a/debian/control b/debian/control index 564b52b..534d4ba 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Kang Lin Build-Depends: debhelper (>= 6) -Standards-Version:"v2.0.10" +Standards-Version:"2.0.11" Homepage: https://github.com/KangLin/ChineseChessControl Vcs-Git: https://github.com/KangLin/ChineseChessControl.git #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ChineseChessControl.git