Also build raylib in CI on Windows + fixed CI errors

texus · Apr 9, 2024 · 9fc7827 · 9fc7827
1 parent d1fd341
commit 9fc7827
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -187,7 +187,8 @@ jobs:
           -DSDL3_DIR="$GITHUB_WORKSPACE/SDL_INSTALL/lib/cmake/SDL3/"
           -DSDL3_ttf_DIR="$GITHUB_WORKSPACE/SDL_TTF_INSTALL/lib/cmake/SDL3_ttf/"
           -Dglfw3_DIR="$GITHUB_WORKSPACE/GLFW_INSTALL/lib/cmake/glfw3/"
-          -Draylib_DIR="$GITHUB_WORKSPACE/RAYLIB_INSTALL/lib/cmake/raylib/"
+          -Draylib_INCLUDE_DIR="$GITHUB_WORKSPACE/RAYLIB_INSTALL/include"
+          -Draylib_LIBRARY="$GITHUB_WORKSPACE/RAYLIB_INSTALL/lib/libraylib.so"
           -DBUILD_SHARED_LIBS=ON
           -DCMAKE_BUILD_TYPE=Debug
           -DTGUI_CXX_STANDARD=20
@@ -346,7 +347,8 @@ jobs:
           -DSDL2_DIR="$GITHUB_WORKSPACE/SDL_INSTALL/lib/cmake/SDL2/"
           -DSDL2_TTF_PATH="$GITHUB_WORKSPACE/SDL_TTF_INSTALL"
           -Dglfw3_DIR="$GITHUB_WORKSPACE/GLFW_INSTALL/lib/cmake/glfw3/"
-          -Draylib_DIR="$GITHUB_WORKSPACE/RAYLIB_INSTALL/lib/cmake/raylib/"
+          -Draylib_INCLUDE_DIR="$GITHUB_WORKSPACE/RAYLIB_INSTALL/include"
+          -Draylib_LIBRARY="$GITHUB_WORKSPACE/RAYLIB_INSTALL/lib/libraylib.so"
           -DBUILD_SHARED_LIBS=ON
           -DTGUI_CXX_STANDARD=14
           -DTGUI_WARNINGS_AS_ERRORS=ON
@@ -504,6 +506,7 @@ jobs:
       SDL_VERSION: 2.28.3
       SDL_TTF_VERSION: 2.20.2
       GLFW_VERSION: 3.4
+      RAYLIB_VERSION: 5.0
       FREETYPE_VERSION: 2.13.2
       MSVC_TOOLSET_VERSION: 143  # VS2022
     steps:
@@ -517,11 +520,13 @@ jobs:
           C:\msys64\usr\bin\wget.exe -nv https://github.com/libsdl-org/SDL_ttf/releases/download/release-${env:SDL_TTF_VERSION}/SDL2_ttf-devel-${env:SDL_TTF_VERSION}-VC.zip
           C:\msys64\usr\bin\wget.exe -nv https://github.com/glfw/glfw/releases/download/${env:GLFW_VERSION}/glfw-${env:GLFW_VERSION}.bin.WIN32.zip
           C:\msys64\usr\bin\wget.exe -nv https://github.com/ubawurinna/freetype-windows-binaries/archive/refs/tags/v${env:FREETYPE_VERSION}.zip
+          C:\msys64\usr\bin\wget.exe -nv https://github.com/raysan5/raylib/releases/download/${env:RAYLIB_VERSION}/raylib-${env:RAYLIB_VERSION}_win32_msvc16.zip
           7z x SFML-${env:SFML_VERSION}-windows-vc17-32-bit.zip
           7z x SDL2-devel-${env:SDL_VERSION}-VC.zip
           7z x SDL2_ttf-devel-${env:SDL_TTF_VERSION}-VC.zip
           7z x glfw-${env:GLFW_VERSION}.bin.WIN32.zip
           7z x v${env:FREETYPE_VERSION}.zip
+          7z x raylib-${env:RAYLIB_VERSION}_win32_msvc16.zip
 
       - name: Build TGUI
         run: >
@@ -532,6 +537,8 @@ jobs:
           -DGLFW_INCLUDE_DIR="${env:GITHUB_WORKSPACE}/glfw-${env:GLFW_VERSION}.bin.WIN32/include"
           -DGLFW_LIBRARY="${env:GITHUB_WORKSPACE}/glfw-${env:GLFW_VERSION}.bin.WIN32/lib-vc2022/glfw3dll.lib"
           -DFREETYPE_WINDOWS_BINARIES_PATH="${env:GITHUB_WORKSPACE}/freetype-windows-binaries-${env:FREETYPE_VERSION}"
+          -Draylib_INCLUDE_DIR="${env:GITHUB_WORKSPACE}/raylib-${env:RAYLIB_VERSION}_win32_msvc16/include"
+          -Draylib_LIBRARY="${env:GITHUB_WORKSPACE}/raylib-${env:RAYLIB_VERSION}_win32_msvc16/lib/raylibdll.lib"
           -DCMAKE_UNITY_BUILD=OFF
           -DBUILD_SHARED_LIBS=ON
           -DTGUI_CXX_STANDARD=23
@@ -543,6 +550,7 @@ jobs:
           -DTGUI_HAS_BACKEND_SFML_GRAPHICS=ON
           -DTGUI_HAS_BACKEND_SDL_RENDERER=ON
           -DTGUI_HAS_BACKEND_GLFW_OPENGL3=ON
+          -DTGUI_HAS_BACKEND_RAYLIB=ON
 
           cmake --build TGUI-build --config Debug
 

diff --git a/src/Backend/Renderer/Raylib/BackendTextureRaylib.cpp b/src/Backend/Renderer/Raylib/BackendTextureRaylib.cpp
@@ -60,7 +60,7 @@ namespace tgui
                 m_texture.id = 0;
             }
 
-            static_assert(sizeof(Image) == sizeof(void*) + 4*sizeof(int));
+            static_assert(sizeof(Image) == sizeof(void*) + 4*sizeof(int), "Assuming layout of Image class (c++20 aggregate initialization would solve this)");
             Image image = {
                 const_cast<std::uint8_t*>(pixels),
                 static_cast<int>(size.x),

diff --git a/src/DefaultBackendWindow.cpp b/src/DefaultBackendWindow.cpp
@@ -570,7 +570,7 @@ namespace tgui
             if (!pixelPtr)
                 return;
 
-            static_assert(sizeof(Image) == sizeof(void*) + 4*sizeof(int));
+            static_assert(sizeof(Image) == sizeof(void*) + 4*sizeof(int), "Assuming layout of Image class (c++20 aggregate initialization would solve this)");
             Image icon = {
                 const_cast<std::uint8_t*>(pixelPtr.get()),
                 static_cast<int>(iconSize.x),