Update windows.yml

This commit is contained in:
Ray 2020-08-20 19:10:38 +02:00 committed by GitHub
parent 5ec0f68937
commit c500b9c036
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -13,7 +13,7 @@ jobs:
fail-fast: false fail-fast: false
max-parallel: 1 max-parallel: 1
matrix: matrix:
compiler: [mingw-w64, msvc16] compiler: [mingw-w64, clang, msvc16]
bits: [32, 64] bits: [32, 64]
include: include:
- compiler: mingw-w64 - compiler: mingw-w64
@ -26,6 +26,14 @@ jobs:
ARCH: "x86_64" ARCH: "x86_64"
COMPILER_PATH: "C:\\msys64\\mingw64\\bin" COMPILER_PATH: "C:\\msys64\\mingw64\\bin"
WINDRES_ARCH: pe-x86-64 WINDRES_ARCH: pe-x86-64
- compiler: clang
bits: 32
ARCH: "i686"
COMPILER_PATH: "C:\\msys64\\clang32\\bin"
- compiler: clang
bits: 64
ARCH: "x86_64"
COMPILER_PATH: "C:\\msys64\\clang64\\bin"
- compiler: msvc16 - compiler: msvc16
bits: 32 bits: 32
ARCH: "x86" ARCH: "x86"
@ -53,8 +61,7 @@ jobs:
mkdir include mkdir include
mkdir lib mkdir lib
cd ../../../raylib cd ../../../raylib
dir C:\msys64\clang32 dir C:\msys64\clang32\bin
dir C:\msys64\clang64
# Setup MSBuild.exe path if required # Setup MSBuild.exe path if required
- name: Setup MSBuild - name: Setup MSBuild
@ -64,7 +71,6 @@ jobs:
- name: Build Library (MinGW-w64) - name: Build Library (MinGW-w64)
run: | run: |
cd src cd src
set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
${{ matrix.ARCH }}-w64-mingw32-gcc.exe -v ${{ matrix.ARCH }}-w64-mingw32-gcc.exe -v
${{ matrix.COMPILER_PATH }}/windres.exe -h ${{ matrix.COMPILER_PATH }}/windres.exe -h
make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
@ -73,6 +79,16 @@ jobs:
cd .. cd ..
shell: cmd shell: cmd
if: matrix.compiler == 'mingw-w64' if: matrix.compiler == 'mingw-w64'
- name: Build Library (Clang)
run: |
cd src
${{ matrix.COMPILER_PATH }}\clang.exe -v
make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
cd ..
shell: cmd
if: matrix.compiler == 'clang'
- name: Build Library (MSVC16) - name: Build Library (MSVC16)
run: | run: |