Update windows.yml
This commit is contained in:
parent
aa6c3c869d
commit
d6a566da06
1 changed files with 7 additions and 20 deletions
25
.github/workflows/windows.yml
vendored
25
.github/workflows/windows.yml
vendored
|
@ -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,29 +56,16 @@ jobs:
|
|||
uses: microsoft/setup-msbuild@v1.0.1
|
||||
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: |
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue