Update windows.yml

This commit is contained in:
Ray
2020-08-20 17:41:08 +02:00
committed by GitHub
parent 3490e0c1b4
commit 7737085c1b

View File

@ -18,14 +18,12 @@ jobs:
include: include:
- compiler: mingw-w64 - compiler: mingw-w64
bits: 32 bits: 32
ARCH: "x86" ARCH: "i686"
COMPILER_PATH: "C:\\msys64\\mingw32\\bin" COMPILER_PATH: "C:\\msys64\\mingw32\\bin"
COMPILER_NAME: "i686-w64-mingw32-gcc.exe"
- compiler: mingw-w64 - compiler: mingw-w64
bits: 64 bits: 64
ARCH: "x64" ARCH: "x86_64"
COMPILER_PATH: "C:\\msys64\\mingw64\\bin" COMPILER_PATH: "C:\\msys64\\mingw64\\bin"
COMPILER_NAME: "x86_64-w64-mingw32-gcc.exe"
- compiler: msvc16 - compiler: msvc16
bits: 32 bits: 32
ARCH: "x86" ARCH: "x86"
@ -63,12 +61,13 @@ jobs:
run: | run: |
cd src cd src
set PATH=%PATH%;${{ matrix.COMPILER_PATH }} set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
${{ matrix.COMPILER_NAME }} -v ${{ matrix.ARCH }}-w64-mingw32-gcc.exe -v
make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} 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"
make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B windres raylib.dll.rc -o raylib.dll.rc.data --target=pe-${{ matrix.ARCH }}
make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
cd .. cd ..
shell: cmd shell: cmd
if: matrix.compiler == 'mingw-w64' && matrix.bits == 32 if: matrix.compiler == 'mingw-w64'
- name: Build Library (MSVC16) - name: Build Library (MSVC16)
run: | run: |
@ -106,4 +105,3 @@ jobs:
asset_name: ${{ env.RELEASE_NAME }}.zip asset_name: ${{ env.RELEASE_NAME }}.zip
asset_content_type: application/zip asset_content_type: application/zip
if: github.event_name == 'release' && github.event.action == 'published' if: github.event_name == 'release' && github.event.action == 'published'