Merge pull request #135 from madebr/update-202408

Get rid of conan, update imgui, and merge all workflows

.github/workflows/build.yml

@@ -0,0 +1,77 @@
+name: Build
+on:
+  pull_request:
+  push:
+  release:
+    types: published
+jobs:
+  build-cmake:
+    name: ${{ matrix.case.name }}
+    runs-on: ${{ matrix.case.os }}
+    container: ${{ matrix.case.container }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        case:
+        - { name: 'Windows (DirectX 9)',  os: 'windows-latest', platform: 'D3D9' }
+        - { name: 'Windows (GL3, glfw)',  os: 'windows-latest', platform: 'GL3',  gl3_gfxlib: 'GLFW' }
+        - { name: 'Windows (GL3, SDL2)',  os: 'windows-latest', platform: 'GL3',  gl3_gfxlib: 'SDL2' }
+        - { name: 'Windows (null)',       os: 'windows-latest', platform: 'NULL' }
+        - { name: 'macOS (GL3, glfw)',    os: 'macos-latest',   platform: 'GL3',  gl3_gfxlib: 'GLFW' }
+        - { name: 'macOS (GL3, SDL2)',    os: 'macos-latest',   platform: 'GL3',  gl3_gfxlib: 'SDL2' }
+        - { name: 'macOS (null)',         os: 'macos-latest',   platform: 'NULL' }
+        - { name: 'Ubuntu (GL3, glfw)',   os: 'ubuntu-latest',  platform: 'GL3',  gl3_gfxlib: 'GLFW' }
+        - { name: 'Ubuntu (GL3, SDL2)',   os: 'ubuntu-latest',  platform: 'GL3',  gl3_gfxlib: 'SDL2' }
+        - { name: 'Ubuntu (null)',        os: 'ubuntu-latest',  platform: 'NULL' }
+        - { name: 'PlayStation 2',        os: 'ubuntu-latest',  platform: 'PS2',  ps2: true,                              container: 'ps2dev/ps2dev:latest',        cmake-toolchain-file: 'cmake/ps2/cmaketoolchain/toolchain_ps2_ee.cmake' }
+        - { name: 'Nintendo Switch',      os: 'ubuntu-latest',  platform: 'GL3',  gl3_gfxlib: 'GLFW', glfw-nobuild: true, container: 'devkitpro/devkita64:latest',  cmake-toolchain-file: '/opt/devkitpro/cmake/Switch.cmake' }
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: 'Install PS2 dependencies'
+        if: ${{ matrix.case.ps2 }}
+        run: |
+          apk add cmake gmp mpc1 mpfr4 make pkgconf git
+      - name: 'Setup SDL2'
+        if: ${{ matrix.case.gl3_gfxlib == 'SDL2' }}
+        uses: libsdl-org/setup-sdl@main
+        with:
+          version: 2-latest
+          install-linux-dependencies: true
+          cmake-toolchain-file: ${{ matrix.case.cmake-toolchain-file }}
+      - name: 'Setup GLFW'
+        if: ${{ matrix.case.gl3_gfxlib == 'GLFW' && !matrix.case.glfw-nobuild }}
+        shell: sh
+        run: |
+          ${{ (runner.os == 'Linux' && 'sudo apt-get update -y && sudo apt-get install -y libwayland-dev libxkbcommon-dev xorg-dev') || '' }}
+          git clone "https://github.com/glfw/glfw.git" glfw-source --depth 1
+          cmake -S glfw-source -B glfw-build -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF -DGLFW_INSTALL=ON -DCMAKE_INSTALL_PREFIX=glfw-prefix -DCMAKE_TOOLCHAIN_FILE="${{ matrix.case.cmake-toolchain-file }}" -DCMAKE_BUILD_TYPE=Release
+          cmake --build glfw-build --config Release
+          cmake --install glfw-build --config Release
+          echo "glfw3_ROOT=${{ github.workspace}}/glfw-prefix" >${GITHUB_ENV}
+      - name: 'Configure (CMake)'
+        shell: sh
+        run: |
+          cmake -S . -B build \
+            -DLIBRW_PLATFORM=${{ matrix.case.platform }} \
+            -DLIBRW_GL3_GFXLIB=${{ matrix.case.gl3_gfxlib }} \
+            -DCMAKE_TOOLCHAIN_FILE=${{ matrix.case.cmake-toolchain-file }} \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_POLICY_DEFAULT_CMP0074=NEW
+      - name: 'Build (CMake)'
+        run: |
+          cmake --build build --config Release --verbose
+      - name: 'Create binary package (CPack)'
+        run: |
+          cd build
+          cpack . -C Release
+      - name: 'Archive binary package (GitHub artifacts)'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.case.os }}-${{ matrix.case.platform }}${{ (matrix.case.gl3_gfxlib != '' && format('-{0}', matrix.case.gl3_gfxlib)) || '' }}
+          path: build/*.tar.xz
+          if-no-files-found: error

CMakeLists.txt

@@ -30,22 +30,24 @@ else()
     set(LIBRW_PLATFORM_GL3_REQUIRES_OPENGL ON)
 endif()
 list(GET LIBRW_PLATFORMS 0 LIBRW_PLATFORM_DEFAULT)
-set(LIBRW_PLATFORM "${LIBRW_PLATFORM_DEFAULT}" CACHE STRING "Platform")
+set(LIBRW_PLATFORM "${LIBRW_PLATFORM_DEFAULT}" CACHE STRING "Platform (choices=${LIBRW_PLATFORMS})")
 set_property(CACHE LIBRW_PLATFORM PROPERTY STRINGS ${LIBRW_PLATFORMS})
 message(STATUS "LIBRW_PLATFORM = ${LIBRW_PLATFORM} (choices=${LIBRW_PLATFORMS})")
 set("LIBRW_PLATFORM_${LIBRW_PLATFORM}" ON)
 if(NOT LIBRW_PLATFORM IN_LIST LIBRW_PLATFORMS)
     message(FATAL_ERROR "Illegal LIBRW_PLATFORM=${LIBRW_PLATFORM}")
 endif()
 
-set(LIBRW_GL3_GFXLIBS "GLFW" "SDL2")
-set(LIBRW_GL3_GFXLIB "GLFW" CACHE STRING "gfxlib for gl3")
-set_property(CACHE LIBRW_GL3_GFXLIB PROPERTY STRINGS ${LIBRW_GL3_GFXLIBS})
 if(LIBRW_PLATFORM_GL3)
-    message(STATUS "LIBRW_GL3_GFXLIB = ${LIBRW_GL3_GFXLIB} (choices=${LIBRW_GL3_GFXLIBS})")
-endif()
-if(NOT LIBRW_GL3_GFXLIB IN_LIST LIBRW_GL3_GFXLIBS)
-    message(FATAL_ERROR "Illegal LIBRW_GL3_GFXLIB=${LIBRW_GL3_GFXLIB}")
+    set(LIBRW_GL3_GFXLIBS "GLFW" "SDL2")
+    set(LIBRW_GL3_GFXLIB "GLFW" CACHE STRING "gfxlib for gl3 (choices=${LIBRW_GL3_GFXLIBS})")
+    set_property(CACHE LIBRW_GL3_GFXLIB PROPERTY STRINGS ${LIBRW_GL3_GFXLIBS})
+    if(LIBRW_PLATFORM_GL3)
+        message(STATUS "LIBRW_GL3_GFXLIB = ${LIBRW_GL3_GFXLIB} (choices=${LIBRW_GL3_GFXLIBS})")
+    endif()
+    if(NOT LIBRW_GL3_GFXLIB IN_LIST LIBRW_GL3_GFXLIBS)
+        message(FATAL_ERROR "Illegal LIBRW_GL3_GFXLIB=${LIBRW_GL3_GFXLIB}")
+    endif()
 endif()
 
 if(LIBRW_PLATFORM_PS2)

cmake/librw-config.cmake.in

@@ -20,7 +20,10 @@ if(LIBRW_PLATFORM_GL3)
         endif()
     elseif(LIBRW_GL3_GFXLIB STREQUAL "SDL2")
         if (NOT TARGET SDL2::SDL2)
-            find_package(SDL2 REQUIRED)
+            find_package(SDL2 CONFIG)
+            if (NOT TARGET SDL2::SDL2)
+                find_package(SDL2 MODULE REQUIRED)
+            endif()
         endif()
     endif()
 endif()

skeleton/CMakeLists.txt

@@ -24,6 +24,7 @@ add_library(librw_skeleton
     imgui/ImGuizmo.h
 )
 add_library(librw::skeleton ALIAS librw_skeleton)
+target_compile_features(librw_skeleton PUBLIC cxx_std_11)
 
 set_target_properties(librw_skeleton
     PROPERTIES
@@ -37,6 +38,10 @@ target_link_libraries(librw_skeleton
         librw
 )
 
+if (LIBRW_GL3_GFXLIB STREQUAL "SDL2")
+    target_compile_definitions(librw_skeleton PRIVATE SDL_MAIN_HANDLED)
+endif()
+
 target_include_directories(librw_skeleton
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>