diff options
| author | Ray <[email protected]> | 2020-08-20 12:34:10 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-20 12:34:10 +0200 |
| commit | d6a566da062ffaa800bcd3cddcd30d450bd8f101 (patch) | |
| tree | 299ee30e05f1f3892554353e4d0b38aa01728c49 /.github/workflows | |
| parent | aa6c3c869d3672338eeb8c985915a0b4d42f4fa3 (diff) | |
| download | raylib-d6a566da062ffaa800bcd3cddcd30d450bd8f101.tar.gz raylib-d6a566da062ffaa800bcd3cddcd30d450bd8f101.zip | |
Update windows.yml
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/windows.yml | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d1c86516..0bd21b1b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,11 +19,11 @@ 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" @@ -56,30 +56,17 @@ jobs: uses: microsoft/[email protected] if: matrix.compiler == 'msvc16' - # TODO: Review x86 dynamic library building, linking does not work because x86 libraries are not available - - name: Build Library (MinGW-w64) - run: | - cd src - set PATH=%PATH%;${{ matrix.COMPILER_PATH }} - i686-w64-mingw32-gcc.exe -v - mingw32-make PLATFORM=PLATFORM_DESKTOP CC="i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" - mingw32-make PLATFORM=PLATFORM_DESKTOP CC="i686-w64-mingw32-gcc.exe" 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' && matrix.bits == 32 - - # Previous job should do 32bit and 64bit but there are config issues with the host-machine # 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" - make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" + ${{ 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' && matrix.bits == 64 - + if: matrix.compiler == 'mingw-w64' && matrix.bits == 32 + - name: Build Library (MSVC16) run: | cd projects/VS2017 |