From 4c4c17d0def922e67e9f71fee0b73359aa8d860e Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 15 Oct 2024 16:23:03 +0100 Subject: [PATCH] try --- .github/workflows/build.yml | 154 ++++++++++++++++++------------------ raylib/build.py | 22 ++++-- 2 files changed, 91 insertions(+), 85 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58f20e0..3c3a6c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -342,81 +342,81 @@ jobs: name: wheel path: dist/* - source-distro: - runs-on: ubuntu-20.04 +# source-distro: +# runs-on: ubuntu-20.04 +# +# steps: +# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it +# - uses: actions/checkout@v2 +# with: +# submodules: recursive +# +# - name: Setup Python +# uses: actions/setup-python@v2.2.2 +# with: +# # Version range or exact version of a Python version to use, using SemVer's version range syntax. +# python-version: '3.12' +# # The target architecture (x86, x64) of the Python interpreter. +# architecture: x64 +# +# - name: Build raylib +# run: | +# sudo apt update +# sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev +# cd raylib-c +# mkdir build +# cd build +# cmake -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release .. +# make -j2 +# sudo make install +# - name: Copy extras +# run: | +# sudo cp -r raylib-c/src/external/glfw/include/GLFW /usr/local/include/ +# sudo cp physac/src/physac.h /usr/local/include/ +# sudo cp raygui/src/raygui.h /usr/local/include/ +# +# - name: Build raylib-python-cffi +# run: | +# python -m pip install --upgrade pip +# pip3 install "cffi>=1.17.1" +# pip3 install wheel +# pip3 install setuptools +# python setup.py sdist +# +# - name: Upload build Artifact wheel +# uses: actions/upload-artifact@v3.2.1 +# with: +# name: wheel +# path: dist/* - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Setup Python - uses: actions/setup-python@v2.2.2 - with: - # Version range or exact version of a Python version to use, using SemVer's version range syntax. - python-version: '3.12' - # The target architecture (x86, x64) of the Python interpreter. - architecture: x64 - - - name: Build raylib - run: | - sudo apt update - sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev - cd raylib-c - mkdir build - cd build - cmake -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release .. - make -j2 - sudo make install - - name: Copy extras - run: | - sudo cp -r raylib-c/src/external/glfw/include/GLFW /usr/local/include/ - sudo cp physac/src/physac.h /usr/local/include/ - sudo cp raygui/src/raygui.h /usr/local/include/ - - - name: Build raylib-python-cffi - run: | - python -m pip install --upgrade pip - pip3 install "cffi>=1.17.1" - pip3 install wheel - pip3 install setuptools - python setup.py sdist - - - name: Upload build Artifact wheel - uses: actions/upload-artifact@v3.2.1 - with: - name: wheel - path: dist/* - - dynamic-distro: - runs-on: ubuntu-20.04 - - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Setup Python - uses: actions/setup-python@v2.2.2 - with: - # Version range or exact version of a Python version to use, using SemVer's version range syntax. - python-version: '3.12' - # The target architecture (x86, x64) of the Python interpreter. - architecture: x64 - - - name: Build raylib-python-cffi-dynamic - run: | - python -m pip install --upgrade pip - pip3 install "cffi>=1.17.1" - pip3 install wheel - pip3 install setuptools - cd dynamic - python setup.py sdist - - - name: Upload build Artifact wheel - uses: actions/upload-artifact@v3.2.1 - with: - name: wheel - path: dynamic/dist/* +# dynamic-distro: +# runs-on: ubuntu-20.04 +# +# steps: +# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it +# - uses: actions/checkout@v2 +# with: +# submodules: recursive +# +# - name: Setup Python +# uses: actions/setup-python@v2.2.2 +# with: +# # Version range or exact version of a Python version to use, using SemVer's version range syntax. +# python-version: '3.12' +# # The target architecture (x86, x64) of the Python interpreter. +# architecture: x64 +# +# - name: Build raylib-python-cffi-dynamic +# run: | +# python -m pip install --upgrade pip +# pip3 install "cffi>=1.17.1" +# pip3 install wheel +# pip3 install setuptools +# cd dynamic +# python setup.py sdist +# +# - name: Upload build Artifact wheel +# uses: actions/upload-artifact@v3.2.1 +# with: +# name: wheel +# path: dynamic/dist/* diff --git a/raylib/build.py b/raylib/build.py index 70ac585..74fc9af 100644 --- a/raylib/build.py +++ b/raylib/build.py @@ -196,21 +196,27 @@ def build_windows(): ffibuilder.cdef(open("raylib/raygui.h.modified").read()) ffibuilder.cdef(open("raylib/physac.h.modified").read()) ffibuilder.cdef(open("raylib/raymath.h.modified").read()) - ffibuilder.set_source("raylib._raylib_cffi", """ + + ffi_includes = """ #include "raylib.h" - #include "rlgl.h" + #include "rlgl.h" #include "raymath.h" - """ + """ - #include "GLFW/glfw3.h" - """ if not USE_SDL2 else "" - + """ + + if not USE_SDL2: + ffi_includes += + """ + #include "GLFW/glfw3.h" + """ + + ffi_includes += """ #define RAYGUI_IMPLEMENTATION #define RAYGUI_SUPPORT_RICONS #include "raygui.h" #define PHYSAC_IMPLEMENTATION - #include "physac.h" - """, + #include "physac.h" + """ + ffibuilder.set_source("raylib._raylib_cffi", ffi_includes, extra_link_args=['/NODEFAULTLIB:MSVCRTD'], extra_compile_args=["/D_CFFI_NO_LIMITED_API"], py_limited_api=False,