Compare commits
	
		
			1 Commits
		
	
	
		
			9e9a270550
			...
			master
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 478f2f112f | 
							
								
								
									
										12
									
								
								.github/workflows/cd.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/cd.yml
									
									
									
									
										vendored
									
									
								
							| @@ -204,8 +204,18 @@ jobs: | |||||||
|     #- uses: ilammy/setup-nasm@v1 |     #- uses: ilammy/setup-nasm@v1 | ||||||
|  |  | ||||||
|     - name: Configure CMake |     - name: Configure CMake | ||||||
|  |       env: | ||||||
|  |         CXXFLAGS: "/D_MSVC_STL_HARDENING=1" | ||||||
|       # TODO: og asan had this -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded |       # TODO: og asan had this -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded | ||||||
|       run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DTOMATO_BREAKPAD=ON -DTOMATO_TOX_AV=ON -DTOMATO_ASAN=${{matrix.type == 'asan' && 'ON' || 'OFF'}} |       run: cmake -G Ninja | ||||||
|  |         -B ${{github.workspace}}/build | ||||||
|  |         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} | ||||||
|  |         -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static | ||||||
|  |         -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON | ||||||
|  |         -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF | ||||||
|  |         -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe | ||||||
|  |         -DTOMATO_BREAKPAD=ON -DTOMATO_TOX_AV=ON | ||||||
|  |         -DTOMATO_ASAN=${{matrix.type == 'asan' && 'ON' || 'OFF'}} | ||||||
|  |  | ||||||
|     - name: Build |     - name: Build | ||||||
|       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -t tomato |       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -t tomato | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -179,7 +179,15 @@ jobs: | |||||||
|         arch: amd64 |         arch: amd64 | ||||||
|  |  | ||||||
|     - name: Configure CMake |     - name: Configure CMake | ||||||
|       run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe |       env: | ||||||
|  |         CXXFLAGS: "/D_MSVC_STL_HARDENING=1" | ||||||
|  |       run: cmake -G Ninja | ||||||
|  |         -B ${{github.workspace}}/build | ||||||
|  |         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} | ||||||
|  |         -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static | ||||||
|  |         -DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON | ||||||
|  |         -DSDLIMAGE_VENDORED=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_JXL=OFF -DSDLIMAGE_AVIF=OFF | ||||||
|  |         -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe | ||||||
|  |  | ||||||
|     - name: Build |     - name: Build | ||||||
|       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato |       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user