diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index f5caed0c7..1b0c0bdfe 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -45,7 +45,7 @@ jobs: - name: Configure run: cmake -S . -B build -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_APPDIR=1 -DVOXELENGINE_BUILD_TESTS=ON - name: Build - run: cmake --build build -t install + run: cmake --build build -t install -j - name: Run tests run: ctest --test-dir build - name: Run engine tests diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3bc0995bf..ba88d2221 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -39,7 +39,7 @@ jobs: # make && make install INSTALL_INC=/usr/include/lua run: | sudo apt-get update - sudo apt-get install libsdl3-dev libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev + sudo apt-get install libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev # fix luajit paths sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a sudo ln -s /usr/include/luajit-2.1 /usr/include/lua @@ -49,6 +49,13 @@ jobs: cmake -DCMAKE_BUILD_TYPE=Release -DENTT_INSTALL=on .. sudo make install cd ../.. + # install SDL3 + git clone https://github.com/libsdl-org/SDL.git + cd SDL + cmake -G "Ninja Multi-Config" -B.build . + cmake --build .build --config Release -j + sudo cmake --install .build --config Release + cd .. - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only @@ -61,7 +68,7 @@ jobs: - name: Build # Build your program with the given configuration run: | - cmake --build ${{github.workspace}}/build --config ${{inputs.build_type}} + cmake --build ${{github.workspace}}/build --config ${{inputs.build_type}} -j mv ${{github.workspace}}/build/VoxelEngine VoxelEngine - name: Run tests if: ${{ inputs.run_tests }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e4ec458bb..06f0fa2e5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,7 +23,7 @@ jobs: run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1 - name: Build - run: cmake --build build -t install + run: cmake --build build -t install -j - name: Make fix_dylibs.sh executable run: chmod +x dev/fix_dylibs.sh diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index cdf354dd6..f9bf72a2b 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -48,7 +48,7 @@ jobs: mkdir build cd build cmake -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake .. - cmake --build . --config Release + cmake --build . --config Release -j - name: Package for Windows run: | mkdir packaged diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e5ee5a69b..896aa7951 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -32,7 +32,7 @@ jobs: VCPKG_ROOT: ${{ github.workspace }}/vcpkg run: | cmake --preset default-vs-msvc-windows - cmake --build --preset default-vs-msvc-windows --config Release + cmake --build --preset default-vs-msvc-windows --config Release -j - name: Run tests run: ctest --preset default-vs-msvc-windows - name: Run engine tests