Skip to content

Commit 2f8bddd

Browse files
experiment windows bash
1 parent a4e7adb commit 2f8bddd

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ jobs:
581581
# For example, pypy2 and pypy3
582582
matrix:
583583
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', 'pypy-3.11', 'pypy-3.10' ]
584-
raylib-platform: ['Desktop', 'SDL']
584+
raylib-platform: ['Desktop', 'SDL', 'SDL_SOFT']
585585
steps:
586586
- uses: actions/checkout@v4
587587
with:
@@ -624,9 +624,9 @@ jobs:
624624
cd build
625625
cmake -DPLATFORM=${{ matrix.raylib-platform }} -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
626626
msbuild raylib.sln /target:raylib /property:Configuration=Release
627-
copy raylib\Release\raylib.lib ..\..
628-
cd ..\..
629-
shell: cmd
627+
cp raylib/Release/raylib.lib ../..
628+
cd ../..
629+
shell: bash
630630

631631
- name: Build raylib-python-cffi
632632
env:

raylib/build.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def build_unix():
225225
extra_link_args = flags.split() + ['-framework', 'OpenGL', '-framework', 'Cocoa',
226226
'-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework',
227227
'CoreVideo']
228-
if RAYLIB_PLATFORM=="SDL":
228+
if RAYLIB_PLATFORM=="SDL" or RAYLIB_PLATFORM=="SDL_SOFT":
229229
extra_link_args += ['/usr/local/lib/libSDL3.a', '-framework', 'CoreHaptics', '-framework', 'ForceFeedback',
230230
'-framework', 'GameController']
231231
libraries = []
@@ -300,9 +300,15 @@ def build_windows():
300300
#include "physac.h"
301301
"""
302302

303-
libraries = ['raylib', 'gdi32', 'shell32', 'user32', 'OpenGL32', 'winmm']
304-
if RAYLIB_PLATFORM=="SDL":
303+
libraries = ['raylib', 'gdi32', 'shell32', 'user32', 'winmm']
304+
if RAYLIB_PLATFORM=="Desktop":
305+
libraries += ['OpenGL32']
306+
elif RAYLIB_PLATFORM=="SDL":
307+
libraries += ['OpenGL32', 'SDL3']
308+
elif RAYLIB_PLATFORM=="SDL_SOFT":
305309
libraries += ['SDL3']
310+
else:
311+
raise Exception("Unknown or not set RAYLIB_PLATFORM")
306312

307313
print("libraries: "+str(libraries))
308314
ffibuilder.set_source("raylib._raylib_cffi", ffi_includes,

0 commit comments

Comments
 (0)