diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index a92e80ae..7740e3b3 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -40,7 +40,16 @@ runs: run: sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev shell: ${{ inputs.shell_type }} + # Mac向けのCMakeのセットアップ + - name: Setup CMake on macOS + if: runner.os == 'macOS' + uses: lukka/get-cmake@latest + with: + cmakeVersion: '3.27.x' # cmakeバージョンを指定 + - name: Check CMake version + run: cmake --version + shell: ${{ inputs.shell_type }} # Unreal Engineと合わせたバージョンでMSVCを用意する準備として、始めからある望みでないバージョンを消します。 # 参考: https://github.com/actions/runner-images/issues/9701 @@ -75,8 +84,6 @@ runs: $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden shell: ${{ inputs.shell_type }} - - # Windowsのみコンパイラパスを通します。 - name: Add msbuild to PATH if: runner.os == 'Windows' @@ -104,7 +111,6 @@ runs: shell: ${{ inputs.shell_type }} # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。 - - name: Build by CMake for Unity run: cmake --build ${{github.workspace}}/out/build/x64-Release-Unity --config ${{env.BUILD_TYPE}} shell: ${{ inputs.shell_type }} diff --git a/.github/actions/upload-mobile-dlls/action.yml b/.github/actions/upload-mobile-dlls/action.yml index 0c9bb08b..53d316a5 100644 --- a/.github/actions/upload-mobile-dlls/action.yml +++ b/.github/actions/upload-mobile-dlls/action.yml @@ -56,6 +56,13 @@ runs: - name: Install ninja-build tool uses: seanmiddleditch/gha-setup-ninja@v3 + # Mac向けのCMakeのセットアップ + - name: Setup CMake on macOS + if: runner.os == 'macOS' + uses: lukka/get-cmake@latest + with: + cmakeVersion: '3.27.x' # cmakeバージョンを指定 + - name: Configure CMake for Android if: runner.os == 'Linux' run: > @@ -71,7 +78,7 @@ runs: shell: ${{ inputs.shell_type }} - name: Configure CMake for iOS - if: runner.os == 'MacOS' + if: runner.os == 'macOS' run: > cmake -S ${{github.workspace}} @@ -95,7 +102,7 @@ runs: path: ${{github.workspace}}/out/build/x64-Release/src/libplateau.so - name: Upload framework for iOS - if: runner.os == 'MacOS' + if: runner.os == 'macOS' uses: actions/upload-artifact@v4 with: name: libplateau-ios-dll diff --git a/src/c_wrapper/vector_tile_downloader_c.cpp b/src/c_wrapper/vector_tile_downloader_c.cpp index 99989fee..2460d523 100644 --- a/src/c_wrapper/vector_tile_downloader_c.cpp +++ b/src/c_wrapper/vector_tile_downloader_c.cpp @@ -42,7 +42,7 @@ using namespace plateau::geometry; DLL_STRING_VALUE_FUNC(plateau_vector_tile_downloader_calc_destination_path, VectorTileDownloader, - handle->calcDestinationPath(index).string(), , int index) + handle->calcDestinationPath(index).u8string(), , int index) DLL_VALUE_FUNC(plateau_vector_tile_downloader_get_tile, VectorTileDownloader,