Merge branch 'master' into feat/gltf-loader
This commit is contained in:
		
							
								
								
									
										63
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										63
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -52,9 +52,7 @@ jobs: | ||||
|  | ||||
|       - name: Build | ||||
|         run: | | ||||
|           sed '/#define _IRR_COMPILE_WITH_OGLES2_/ s|^//||g' -i include/IrrCompileConfig.h | ||||
|           sed '/#define _IRR_COMPILE_WITH_OPENGL_/ s|^|//|g' -i include/IrrCompileConfig.h | ||||
|           cmake . -DBUILD_EXAMPLES=1 | ||||
|           cmake . -DBUILD_EXAMPLES=1 -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON | ||||
|           make -j2 | ||||
|  | ||||
|       - name: Test (headless) | ||||
| @@ -65,7 +63,7 @@ jobs: | ||||
|       - name: Test (Xvfb) | ||||
|         run: | | ||||
|           cd bin/Linux | ||||
|           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest | ||||
|           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2 | ||||
|  | ||||
|   linux-sdl: | ||||
|     runs-on: ubuntu-latest | ||||
| @@ -81,8 +79,7 @@ jobs: | ||||
|  | ||||
|       - name: Build | ||||
|         run: | | ||||
|           sed '/#define _IRR_COMPILE_WITH_SDL_DEVICE_/ s|^//||g' -i include/IrrCompileConfig.h | ||||
|           cmake . -DBUILD_EXAMPLES=1 | ||||
|           cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON | ||||
|           make -j2 | ||||
|  | ||||
|       - name: Test (headless) | ||||
| @@ -119,6 +116,60 @@ jobs: | ||||
|         run: | | ||||
|           ./build/bin/Linux/tests | ||||
|  | ||||
|   linux-sdl-gl3: | ||||
|     runs-on: ubuntu-latest | ||||
|     container: | ||||
|       image: ubuntu:jammy | ||||
|       env: { LANG: "C.UTF-8" } | ||||
|     steps: | ||||
|       - uses: actions/checkout@v3 | ||||
|       - name: Install deps | ||||
|         run: | | ||||
|           apt-get update | ||||
|           apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy | ||||
|  | ||||
|       - name: Build | ||||
|         run: | | ||||
|           cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON | ||||
|           make -j2 | ||||
|  | ||||
|       - name: Test (headless) | ||||
|         run: | | ||||
|           cd bin/Linux | ||||
|           ./AutomatedTest null | ||||
|  | ||||
|       - name: Test (Xvfb) | ||||
|         run: | | ||||
|           cd bin/Linux | ||||
|           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3 | ||||
|  | ||||
|   linux-sdl-gles2: | ||||
|     runs-on: ubuntu-latest | ||||
|     container: | ||||
|       image: ubuntu:jammy | ||||
|       env: { LANG: "C.UTF-8" } | ||||
|     steps: | ||||
|       - uses: actions/checkout@v3 | ||||
|       - name: Install deps | ||||
|         run: | | ||||
|           apt-get update | ||||
|           apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy | ||||
|  | ||||
|       - name: Build | ||||
|         run: | | ||||
|           cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON | ||||
|           make -j2 | ||||
|  | ||||
|       - name: Test (headless) | ||||
|         run: | | ||||
|           cd bin/Linux | ||||
|           ./AutomatedTest null | ||||
|  | ||||
|       - name: Test (Xvfb) | ||||
|         run: | | ||||
|           cd bin/Linux | ||||
|           LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2 | ||||
|  | ||||
|   win32: | ||||
|     runs-on: ubuntu-20.04 | ||||
|     steps: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user