diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 14787521..a92e80ae 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -89,14 +89,6 @@ runs: echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV shell: ${{ inputs.shell_type }} - # Linuxで使うコンパイラを明示 - - 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: > cmake 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..3cd808a0 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用にライブラリをビルド。 @@ -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 174df80d..298ae21a 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 @@ -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/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 diff --git a/README.md b/README.md index 3e3ef71e..60e12d64 100644 --- a/README.md +++ b/README.md @@ -129,9 +129,9 @@ 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` します。 +* Ubuntuでgit lfsを使うために`sudo apt install git-lfs` します。 * OpenGL API が必要なので、なければ以下のコマンドでインストールします。 ``` sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev 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 { /**