From 0d4e3cae1152f27dc66ce1e811906201d9bf702f Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 15:01:16 +0900 Subject: [PATCH 1/8] =?UTF-8?q?GitHub=20Actions=E3=81=AEUbuntu=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/check-submodule-license.yml | 2 +- .github/workflows/upload-dlls-older-visual-studio.yml | 4 ++-- .github/workflows/upload-dlls.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 78812bf3..7d5c4787 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -24,7 +24,7 @@ jobs: arch: x86_64 - os: macos-14 arch: arm64 - - os: ubuntu-20.04 + - os: ubuntu-24.04 # Unity LTSの対応バージョンに合わせておきます arch: x86_64 steps: diff --git a/.github/workflows/check-submodule-license.yml b/.github/workflows/check-submodule-license.yml index 00be6999..fe8048c7 100644 --- a/.github/workflows/check-submodule-license.yml +++ b/.github/workflows/check-submodule-license.yml @@ -15,7 +15,7 @@ on: jobs: check-submodule-license: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/upload-dlls-older-visual-studio.yml b/.github/workflows/upload-dlls-older-visual-studio.yml index 383a2340..95b90ee0 100644 --- a/.github/workflows/upload-dlls-older-visual-studio.yml +++ b/.github/workflows/upload-dlls-older-visual-studio.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019, macos-14, ubuntu-20.04] + os: [windows-2019, macos-14, ubuntu-24.04] # UbuntuはUnity LTSの対応バージョンに合わせておきます arch: [x86_64] include: - os: macos-14 @@ -43,7 +43,7 @@ jobs: uses: ./.github/actions/upload-dll with: shell_type: ${{ (runner.os == 'Windows' && 'powershell') || 'bash' }} - visual_studio_version: "16 2019" + visual_studio_version: "17 2022" # 2つ目のジョブ。 # AndroidとiOS用にライブラリをビルド。 diff --git a/.github/workflows/upload-dlls.yml b/.github/workflows/upload-dlls.yml index 174df80d..9879b87b 100644 --- a/.github/workflows/upload-dlls.yml +++ b/.github/workflows/upload-dlls.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, macos-14, ubuntu-20.04] + os: [windows-2022, macos-14, ubuntu-24.04] # UbuntuはUnity LTSの対応バージョンに合わせておきます arch: [x86_64] include: - os: macos-14 From 53504c30372c3dd6d57ca955852a21ad83b05561 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 15:13:44 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 14787521..11f65185 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -89,13 +89,12 @@ runs: echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV shell: ${{ inputs.shell_type }} - # Linuxで使うコンパイラを明示 + # Linuxで使うコンパイラを明示(g++-9) - name: Setup Additional Cmake Options in Linux if: runner.os == 'Linux' run: | echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=\"/usr/bin/g++-9\"" >> $GITHUB_ENV shell: ${{ inputs.shell_type }} - # Ubuntu 18 だとデフォルトでは g++-7 になりますが、std::filesystem を使う都合上 g++-9 を指定します。 - name: Configure CMake for Unity run: > From c6c0eb7c68f38149b971d07af01e33778599c66f Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 15:21:09 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 11f65185..8ac20be4 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -90,11 +90,11 @@ runs: shell: ${{ inputs.shell_type }} # Linuxで使うコンパイラを明示(g++-9) - - name: Setup Additional Cmake Options in Linux - if: runner.os == 'Linux' - run: | - echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=\"/usr/bin/g++-9\"" >> $GITHUB_ENV - shell: ${{ inputs.shell_type }} + # - name: Setup Additional Cmake Options in Linux + # if: runner.os == 'Linux' + # run: | + # echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=\"/usr/bin/g++-9\"" >> $GITHUB_ENV + # shell: ${{ inputs.shell_type }} - name: Configure CMake for Unity run: > From 46657579de3de5d796a13cc6db16fba4dcc213bf Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 15:42:38 +0900 Subject: [PATCH 4/8] =?UTF-8?q?GLTF=20SDK=E3=82=A2=E3=83=97=E3=83=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdparty/glTF-SDK/glTF-SDK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/glTF-SDK/glTF-SDK b/3rdparty/glTF-SDK/glTF-SDK index 382dea2c..4888f0a3 160000 --- a/3rdparty/glTF-SDK/glTF-SDK +++ b/3rdparty/glTF-SDK/glTF-SDK @@ -1 +1 @@ -Subproject commit 382dea2c80737f9f3ae2b93e97263a593c2ea832 +Subproject commit 4888f0a386e174af6170c3c53b3396945f4a65a0 From e824a0479f65896a283e0e937f5038a9e7e7d5c1 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 15:53:00 +0900 Subject: [PATCH 5/8] =?UTF-8?q?include=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/plateau/dataset/city_model_package.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/plateau/dataset/city_model_package.h b/include/plateau/dataset/city_model_package.h index 18d96510..8ff57960 100644 --- a/include/plateau/dataset/city_model_package.h +++ b/include/plateau/dataset/city_model_package.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace plateau::dataset { /** From 61a5c14080895ce3f1ec9236a0bfc81a8ca597f4 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 18:03:20 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/upload-dlls-older-visual-studio.yml | 4 ++-- .github/workflows/upload-dlls.yml | 4 ++-- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upload-dlls-older-visual-studio.yml b/.github/workflows/upload-dlls-older-visual-studio.yml index 95b90ee0..3cd808a0 100644 --- a/.github/workflows/upload-dlls-older-visual-studio.yml +++ b/.github/workflows/upload-dlls-older-visual-studio.yml @@ -98,7 +98,7 @@ jobs: mkdir -p ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework cp ~/a/libplateau-windows/plateau.dll ~/a/plateau-plugins/dynamic-libs/Windows/x86_64 cp ~/a/libplateau-windows/CSharpPLATEAU.dll ~/a/plateau-plugins/dynamic-libs/ManagedDLL - cp ~/a/libplateau-ubuntu-20.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64 + cp ~/a/libplateau-ubuntu-24.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64 cp ~/a/libplateau-macos-14-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64 cp ~/a/libplateau-macos-14-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64 cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android @@ -110,7 +110,7 @@ jobs: mkdir -p ~/a/plateau-plugins/static-libs/linux mkdir -p ~/a/plateau-plugins/static-libs/macos cp ~/a/libplateau-windows/*.lib ~/a/plateau-plugins/static-libs/windows - cp ~/a/libplateau-ubuntu-20.04/*.a ~/a/plateau-plugins/static-libs/linux + cp ~/a/libplateau-ubuntu-24.04/*.a ~/a/plateau-plugins/static-libs/linux cp ~/a/libplateau-macos-14-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64 cp ~/a/libplateau-macos-14-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64 diff --git a/.github/workflows/upload-dlls.yml b/.github/workflows/upload-dlls.yml index 9879b87b..298ae21a 100644 --- a/.github/workflows/upload-dlls.yml +++ b/.github/workflows/upload-dlls.yml @@ -101,7 +101,7 @@ jobs: mkdir -p ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework cp ~/a/libplateau-windows/plateau.dll ~/a/plateau-plugins/dynamic-libs/Windows/x86_64 cp ~/a/libplateau-windows/CSharpPLATEAU.dll ~/a/plateau-plugins/dynamic-libs/ManagedDLL - cp ~/a/libplateau-ubuntu-20.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64 + cp ~/a/libplateau-ubuntu-24.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64 cp ~/a/libplateau-macos-14-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64 cp ~/a/libplateau-macos-14-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64 cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android @@ -114,7 +114,7 @@ jobs: mkdir -p ~/a/plateau-plugins/static-libs/macos/x86_64 mkdir -p ~/a/plateau-plugins/static-libs/macos/arm64 cp ~/a/libplateau-windows/*.lib ~/a/plateau-plugins/static-libs/windows - cp ~/a/libplateau-ubuntu-20.04/*.a ~/a/plateau-plugins/static-libs/linux + cp ~/a/libplateau-ubuntu-24.04/*.a ~/a/plateau-plugins/static-libs/linux cp ~/a/libplateau-macos-14-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64 cp ~/a/libplateau-macos-14-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64 diff --git a/README.md b/README.md index 3e3ef71e..1069aaa3 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ fbx_sdk は Autodesk社が公開するSDKです。これは自由に製品に組 * C#ユニットテストも合わせて実行可能です。 ### Linuxでの手動ビルド -利用する Linux は、Unityの対応OSに合わせて Ubuntu 20.04 とします。 +利用する Linux は、Unityの対応OSに合わせて Ubuntu 24.04 とします。 #### C++のビルド * Ubuntu 20 はデフォルトでは git lfs がないので、`sudo apt install git-lfs` します。 * OpenGL API が必要なので、なければ以下のコマンドでインストールします。 From 77777f3894b37ac7dfd6979e9738a13e44e10d41 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 22:49:51 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BE=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 8ac20be4..a92e80ae 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -89,13 +89,6 @@ runs: echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV shell: ${{ inputs.shell_type }} - # Linuxで使うコンパイラを明示(g++-9) - # - name: Setup Additional Cmake Options in Linux - # if: runner.os == 'Linux' - # run: | - # echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=\"/usr/bin/g++-9\"" >> $GITHUB_ENV - # shell: ${{ inputs.shell_type }} - - name: Configure CMake for Unity run: > cmake From 1b118be226b213387856d9a296b567114acb0cc7 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 9 May 2025 23:07:57 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=E3=83=97=E3=83=AB=E3=83=AA=E3=82=AF?= =?UTF-8?q?=E6=8C=87=E6=91=98=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1069aaa3..60e12d64 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ fbx_sdk は Autodesk社が公開するSDKです。これは自由に製品に組 ### Linuxでの手動ビルド 利用する Linux は、Unityの対応OSに合わせて Ubuntu 24.04 とします。 #### C++のビルド -* Ubuntu 20 はデフォルトでは git lfs がないので、`sudo apt install git-lfs` します。 +* Ubuntuでgit lfsを使うために`sudo apt install git-lfs` します。 * OpenGL API が必要なので、なければ以下のコマンドでインストールします。 ``` sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev