diff options
| author | raysan5 <[email protected]> | 2020-08-20 17:37:20 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2020-08-20 17:37:20 +0200 |
| commit | 45b28b9d3d3b4569696909ed88eebcc17bcbff5e (patch) | |
| tree | 9b1aa8d21c4a126641a2cc11edf64e138c732b74 /.github/workflows | |
| parent | b499b50154b01f4d36880391bdc8c8112ffb675a (diff) | |
| parent | c47fb0a46398b518fd137401047632fe0d34e8e3 (diff) | |
| download | raylib-45b28b9d3d3b4569696909ed88eebcc17bcbff5e.tar.gz raylib-45b28b9d3d3b4569696909ed88eebcc17bcbff5e.zip | |
Merge branch 'master' of https://github.com/raysan5/raylib
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/linux.yml | 13 | ||||
| -rw-r--r-- | .github/workflows/webassembly.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 18 |
3 files changed, 24 insertions, 11 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3269e1a3..26d3943c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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: | diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index 56746052..7db3142b 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -22,9 +22,6 @@ jobs: with: version: 2.0.0 actions-cache-folder: 'emsdk-cache' - - - name: Test emsdk - run: emcc -v - name: Setup Environment run: | @@ -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 .. diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 932aac87..e28368d1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,10 +18,14 @@ jobs: include: - compiler: mingw-w64 bits: 32 - ARCH: "x86" + 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,16 +58,18 @@ jobs: uses: microsoft/[email protected] 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: | cd projects/VS2017 |