UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/raysan5/raylib

Browse source
This commit is contained in:
raysan5 2020-08-20 17:37:20 +02:00
commit 45b28b9d3d
3 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/linux.yml vendored
View file

@ -45,15 +45,24 @@ jobs:
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
- name: Build Library i386
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 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 == 32
- name: Build Library amd64
run: |
ls //usr/lib
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
run: |

4
.github/workflows/webassembly.yml vendored
View file

@ -23,9 +23,6 @@ jobs:
version: 2.0.0
actions-cache-folder: 'emsdk-cache'
- name: Test emsdk
run: emcc -v
- name: Setup Environment
run: |
mkdir build
@ -39,6 +36,7 @@ jobs:
- name: Build Library
run: |
cd src
emcc -v
make PLATFORM=PLATFORM_WEB EMSDK_PATH="D:/a/raylib/raylib/emsdk-cache/emsdk-master" RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
cd ..

14
.github/workflows/windows.yml vendored
View file

@ -19,9 +19,13 @@ jobs:
- compiler: mingw-w64
bits: 32
ARCH: "x86"
COMPILER_PATH: "C:\\msys64\\mingw32\\bin"
COMPILER_NAME: "i686-w64-mingw32-gcc.exe"
- compiler: mingw-w64
bits: 64
ARCH: "x64"
COMPILER_PATH: "C:\\msys64\\mingw64\\bin"
COMPILER_NAME: "x86_64-w64-mingw32-gcc.exe"
- compiler: msvc16
bits: 32
ARCH: "x86"
@ -54,15 +58,17 @@ jobs:
uses: microsoft/setup-msbuild@v1.0.1
if: matrix.compiler == 'msvc16'
# TODO: Review x86 dynamic library building or remove it
# TODO: Compile resource file raylib.dll.rc for linkage on raylib.dll generation
- name: Build Library (MinGW-w64)
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"
set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
${{ matrix.COMPILER_NAME }} -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.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
cd ..
shell: cmd
if: matrix.compiler == 'mingw-w64'
if: matrix.compiler == 'mingw-w64' && matrix.bits == 32
- name: Build Library (MSVC16)
run: |