Update linux.yml

This commit is contained in:
Ray 2020-08-20 17:45:28 +02:00 committed by GitHub
parent 7737085c1b
commit 784b24e35e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -16,10 +16,10 @@ jobs:
bits: [32, 64] bits: [32, 64]
include: include:
- bits: 32 - bits: 32
ARCH: "x86" ARCH: "i686"
ARCH_NAME: "i386" ARCH_NAME: "i386"
- bits: 64 - bits: 64
ARCH: "x64" ARCH: "x86_64"
ARCH_NAME: "amd64" ARCH_NAME: "amd64"
env: env:
@ -44,25 +44,13 @@ jobs:
sudo apt-get install gcc-multilib lib32gcc-7-dev sudo apt-get install gcc-multilib lib32gcc-7-dev
sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev
# TODO: Review i386 shared library building or remove it - name: Build Library (i386 or amd64)
- name: Build Library i386
run: | run: |
cd src cd src
gcc -v ${{ matrix.ARCH }}-w64-mingw32-gcc -v
make PLATFORM=PLATFORM_DESKTOP CC=gcc 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 RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
# make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
cd .. cd ..
if: matrix.bits == 32
- name: Build Library amd64
run: |
cd src
gcc -v
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
make clean
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
cd ..
if: matrix.bits == 64
- name: Generate Artifacts - name: Generate Artifacts
run: | run: |