Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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 }}
Expand Down
11 changes: 9 additions & 2 deletions .github/actions/upload-mobile-dlls/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >
Expand All @@ -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}}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/c_wrapper/vector_tile_downloader_c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down