Skip to content

Commit 94819c7

Browse files
fixes
1 parent cce9459 commit 94819c7

File tree

1 file changed

+7
-87
lines changed

1 file changed

+7
-87
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -102,87 +102,6 @@ jobs:
102102
name: wheel-mac-${{ matrix.raylib-platform }}-${{ matrix.python-version }}
103103
path: dist/*
104104

105-
# build-mac-universal:
106-
# runs-on: macos-14
107-
# strategy:
108-
# matrix:
109-
# python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10' ]
110-
# raylib-platform: ['Desktop', 'SDL']
111-
# env:
112-
# MACOSX_DEPLOYMENT_TARGET: 11.0
113-
# steps:
114-
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
115-
# - uses: actions/checkout@v4
116-
# with:
117-
# submodules: recursive
118-
#
119-
# - name: Build SDL
120-
# run: |
121-
# wget https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.32.8.tar.gz
122-
# tar xvfz release-2.32.8.tar.gz
123-
# mkdir build
124-
# cd build
125-
# cmake ../SDL-release-2.32.8 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DSDL_SHARED=OFF -DSDL_STATIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
126-
# cmake --build . --config Release
127-
# sudo cmake --install .
128-
#
129-
# - name: Setup Python
130-
# uses: actions/setup-python@v5
131-
# with:
132-
# # Version range or exact version of a Python version to use, using SemVer's version range syntax.
133-
# python-version: ${{ matrix.python-version }}
134-
# architecture: arm64
135-
#
136-
# # Runs a set of commands using the runners shell
137-
# - name: Build raylib without SDL because SDL version has incorrect pkg-config
138-
# run: |
139-
# cd raylib-c
140-
# mkdir build
141-
# cd build
142-
# cmake -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
143-
# make -j2
144-
# sudo make install
145-
#
146-
# - name: Build raylib with SDL if selected
147-
# run: |
148-
# cd raylib-c
149-
# mkdir build2
150-
# cd build2
151-
# cmake -DPLATFORM=${{ matrix.raylib-platform }} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DPLATFORM=SDL -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
152-
# make -j2
153-
# sudo cp raylib/libraylib.a /usr/local/lib/libraylib.a
154-
#
155-
# - name: Copy extras
156-
# run: |
157-
# sudo cp -r raylib-c/src/external/glfw/include/GLFW /usr/local/include/
158-
# sudo cp physac/src/physac.h /usr/local/include/
159-
# sudo cp raygui/src/raygui.h /usr/local/include/
160-
#
161-
# - name: Build raylib-python-cffi
162-
# run: |
163-
# python -m pip install --upgrade pip
164-
# pip3 install "cffi>=1.17.1"
165-
# pip3 install wheel
166-
# pip3 install setuptools
167-
# RAYLIB_PLATFORM=${{ matrix.raylib-platform }} python setup.py bdist_wheel
168-
#
169-
# - name: Upload build Artifact wheel
170-
# uses: actions/upload-artifact@v3.2.1
171-
# with:
172-
# name: wheel
173-
# path: dist/*
174-
175-
#
176-
# # Name defaults to universal2 and it technically is, but we override name to arm64. Why don't we make a working universal2 wheel? Because
177-
# # I'd rather have a separate x86_64 that I can test, and I want it to work on 10_15 but I'm not sure a 'macosx_10_15_universal2' is valid
178-
# # given that there is no SDK for universal until macosx_11_0
179-
# - name: Build raylib-python-cffi
180-
# run: |
181-
# python -m pip install --upgrade pip
182-
# pip3 install cffi
183-
# pip3 install wheel
184-
# python setup.py bdist_wheel --plat-name macosx_12_0_arm64
185-
186105

187106

188107
build-linux:
@@ -232,8 +151,8 @@ jobs:
232151
run: |
233152
${{ matrix.python-version }} -m pip install --upgrade pip
234153
${{ matrix.python-version }} -m pip install --upgrade "cffi>=1.17.1"
235-
${{ matrix.python-version }} -m pip --upgrade wheel
236-
${{ matrix.python-version }} -m pip --upgrade setuptools
154+
${{ matrix.python-version }} -m pip install --upgrade wheel
155+
${{ matrix.python-version }} -m pip install --upgrade setuptools
237156
${{ matrix.python-version }} setup.py bdist_wheel --plat-name manylinux2014_x86_64
238157
- name: Test
239158
run: |
@@ -271,10 +190,6 @@ jobs:
271190
with:
272191
submodules: recursive
273192

274-
- name: fix raygui bug
275-
run: |
276-
patch -p0 <raygui.h.diff
277-
278193
- name: Download SDL2
279194
run: curl -L -o SDL2.zip https://github.com/libsdl-org/SDL/releases/download/release-2.30.8/SDL2-devel-2.30.8-VC.zip
280195

@@ -298,6 +213,11 @@ jobs:
298213
- name: Add msbuild to PATH
299214
uses: microsoft/setup-msbuild@v2
300215

216+
- name: fix raygui bug
217+
run: |
218+
patch -p0 <raygui.h.diff
219+
shell: cmd
220+
301221
- name: Build raylib
302222
run: |
303223
cd raylib-c

0 commit comments

Comments
 (0)