Skip to content

Commit c4efbd1

Browse files
authored
マルチバイトユーザ名で地図が表示されない問題 (#282)
* u8stringに変更 * libcitygml cmakelist version update * revert citygml cmakelist version * libcity gml cmakelist version update 2nd try * 試しにrevert * ソースのみ復元 * libcitygml version update test 3rd try * 3rd partyの変更revert * CMAKE Versionを強制的に変更 * CMakeのバージョンん強制変更 2nd try * cmake version 強制変更 3rd try * 4th try * ビルド通らないのでRevert * another try * another try2 * another try * another * another * cmake version指定 * cmake version 2nd try * cmake version * mac のみ cmake versionを3.27に * mobile build用 cmake version 設定 * 既存のios uploadが正常に動作していなかった?
1 parent 3c20574 commit c4efbd1

3 files changed

Lines changed: 19 additions & 6 deletions

File tree

.github/actions/build/action.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,16 @@ runs:
4040
run: sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev
4141
shell: ${{ inputs.shell_type }}
4242

43+
# Mac向けのCMakeのセットアップ
44+
- name: Setup CMake on macOS
45+
if: runner.os == 'macOS'
46+
uses: lukka/get-cmake@latest
47+
with:
48+
cmakeVersion: '3.27.x' # cmakeバージョンを指定
4349

50+
- name: Check CMake version
51+
run: cmake --version
52+
shell: ${{ inputs.shell_type }}
4453

4554
# Unreal Engineと合わせたバージョンでMSVCを用意する準備として、始めからある望みでないバージョンを消します。
4655
# 参考: https://github.com/actions/runner-images/issues/9701
@@ -75,8 +84,6 @@ runs:
7584
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
7685
shell: ${{ inputs.shell_type }}
7786

78-
79-
8087
# Windowsのみコンパイラパスを通します。
8188
- name: Add msbuild to PATH
8289
if: runner.os == 'Windows'
@@ -104,7 +111,6 @@ runs:
104111
shell: ${{ inputs.shell_type }}
105112
# 10万行超えの警告が出るので一時的な処置として警告を抑制しています。
106113

107-
108114
- name: Build by CMake for Unity
109115
run: cmake --build ${{github.workspace}}/out/build/x64-Release-Unity --config ${{env.BUILD_TYPE}}
110116
shell: ${{ inputs.shell_type }}

.github/actions/upload-mobile-dlls/action.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ runs:
5656
- name: Install ninja-build tool
5757
uses: seanmiddleditch/gha-setup-ninja@v3
5858

59+
# Mac向けのCMakeのセットアップ
60+
- name: Setup CMake on macOS
61+
if: runner.os == 'macOS'
62+
uses: lukka/get-cmake@latest
63+
with:
64+
cmakeVersion: '3.27.x' # cmakeバージョンを指定
65+
5966
- name: Configure CMake for Android
6067
if: runner.os == 'Linux'
6168
run: >
@@ -71,7 +78,7 @@ runs:
7178
shell: ${{ inputs.shell_type }}
7279

7380
- name: Configure CMake for iOS
74-
if: runner.os == 'MacOS'
81+
if: runner.os == 'macOS'
7582
run: >
7683
cmake
7784
-S ${{github.workspace}}
@@ -95,7 +102,7 @@ runs:
95102
path: ${{github.workspace}}/out/build/x64-Release/src/libplateau.so
96103

97104
- name: Upload framework for iOS
98-
if: runner.os == 'MacOS'
105+
if: runner.os == 'macOS'
99106
uses: actions/upload-artifact@v4
100107
with:
101108
name: libplateau-ios-dll

src/c_wrapper/vector_tile_downloader_c.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ using namespace plateau::geometry;
4242

4343
DLL_STRING_VALUE_FUNC(plateau_vector_tile_downloader_calc_destination_path,
4444
VectorTileDownloader,
45-
handle->calcDestinationPath(index).string(), , int index)
45+
handle->calcDestinationPath(index).u8string(), , int index)
4646

4747
DLL_VALUE_FUNC(plateau_vector_tile_downloader_get_tile,
4848
VectorTileDownloader,

0 commit comments

Comments
 (0)