diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ff99d64..a16f4e4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -41,7 +41,7 @@ jobs: ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 ChineseChessControl_VERSION: "v2.0.10" - VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2 + VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d qt_modules: 'qtimageformats qtmultimedia qtscxml qtwebchannel qtwebsockets qtwebview' # Map the job outputs to step outputs diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 39c1c0f..bdddec0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,7 +35,7 @@ jobs: ChineseChessControl_VERSION: "2.0.10" 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/msvc.yml b/.github/workflows/msvc.yml index eca4653..ac46327 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -46,7 +46,7 @@ jobs: CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}} VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}} ChineseChessControl_VERSION: "v2.0.10" - VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2 + 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/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/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> )