Some CI stuff along with 64-bit MSVC patches

.github/workflows/haiku.yml

@@ -0,0 +1,21 @@
+name: Haiku
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: 💳 Check out repository code
+      uses: actions/checkout@v4
+    - name: ⚒️ Build on Haiku
+      uses: cross-platform-actions/action@v0.30.0
+      with:
+        operating_system: haiku
+        version: r1beta5
+        sync_files: runner-to-vm
+        memory: 2G
+        run: |
+          pkgman install -y cmake ninja glu_devel libvorbis_devel
+          cmake . -B build --preset=ci-gcc
+          cmake --build build --preset ninja-quiet

.github/workflows/psp.yml

@@ -0,0 +1,20 @@
+name: PSP
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container:
+      image: pspdev/pspdev:latest
+      volumes:
+        - ${{ github.workspace }}:/src
+    steps:
+    - name: 🎮 Setup tools
+      run: apk add ninja-build
+    - name: 💳 Check out repository code
+      uses: actions/checkout@v4
+    - name: ⚒️ Build with gcc
+      run: |
+        cmake . -B build --preset=ci-psp
+        cmake --build build --preset ninja-quiet

.github/workflows/test.yml

@@ -0,0 +1,89 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest]
+        arch: [x64, x86]
+        include:
+          - os: ubuntu-latest
+            arch: x64
+    defaults:
+      run:
+        shell: bash
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: 💳 Check out repository code
+      uses: actions/checkout@v4
+    - name: 💾 Cache dependencies on Windows
+      if: runner.os == 'Windows'
+      uses: actions/cache@v4
+      with:
+        path: |
+          C:\msys64\var\cache\pacman\pkg
+          C:\vcpkg\installed
+        key: build-dep-windows-${{ matrix.arch }}
+    - name: 🐧 Install dependencies on Linux
+      if: runner.os == 'Linux'
+      run: >-
+        sudo apt-get install -qq -y -o=Dpkg::Use-Pty=0
+        cmake
+        pkgconf
+        libx11-dev
+        libasound2-dev
+        libxxf86dga-dev
+        libjack-dev
+        libgl-dev
+        libglu-dev
+        libpng-dev
+        zlib1g-dev
+        libvorbis-dev
+    - name: 🪟 Set up environment variables on Windows
+      env:
+        MSYSTEM: ${{ matrix.arch == 'x64' && 'MINGW64' || 'MINGW32' }}
+      if: runner.os == 'Windows'
+      run: |
+        echo "VCPKG_ROOT=C:/vcpkg" >> $GITHUB_ENV
+        echo "MSYSTEM=${{ env.MSYSTEM }}" >> $GITHUB_ENV
+    - name: 🪟 Install dependencies on Windows
+      if: runner.os == 'Windows'
+      shell: pwsh
+      run: vcpkg install --triplet ${{ matrix.arch }}-windows libvorbis libpng
+    - name: ⚒️ Build with Visual Studio on Windows
+      env:
+        sdkPath: "C:/Program Files (x86)/Windows Kits/10"
+        sdkVer: "10.0.26100.0"
+        arch: ${{ matrix.arch }}
+      shell: pwsh
+      if: ${{ runner.os == 'Windows' && !cancelled() }}
+      run: |
+        cmake . -B build_vs -A ${{ matrix.arch == 'x64' && 'x64' || 'Win32' }} --preset=ci-vs
+        cmake --build build_vs --config Debug -- /verbosity:quiet
+    - name: 🔍 Add MSYS2 to path on Windows
+      if: ${{ runner.os == 'Windows' && !cancelled() }}
+      shell: pwsh
+      run: |
+        echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "C:\msys64\${{ matrix.arch == 'x64' && 'mingw64' || 'mingw32' }}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+    - name: 🪟 Install msys2 dependencies on Windows
+      env:
+        arch: ${{ matrix.arch == 'x64' && 'x86_64' || 'i686' }}
+      if: ${{ runner.os == 'Windows' && !cancelled() }}
+      run: >-
+        pacman --noconfirm -S
+        mingw-w64-${{ env.arch }}-gcc
+        mingw-w64-${{ env.arch }}-ninja
+        mingw-w64-${{ env.arch }}-cmake
+        mingw-w64-${{ env.arch }}-libpng
+        mingw-w64-${{ env.arch }}-libvorbis
+    - name: ⚒️ Build with gcc
+      env:
+        MINGDIR: "C:/msys64/${{ matrix.arch == 'x64' && 'mingw64' || 'mingw32' }}"
+      if: ${{ !cancelled() }}
+      run: |
+        cmake . -B build --preset=ci-gcc
+        cmake --build build --preset=ninja-quiet

.github/workflows/xc.yml

@@ -0,0 +1,30 @@
+name: Cross compilation
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: 💳 Check out repository code
+      uses: actions/checkout@v4
+    - name: 🐧 Setup
+      run: >-
+        sudo apt-get install -qq -y -o=Dpkg::Use-Pty=0
+        mingw-w64-x86-64-dev
+        binutils-mingw-w64-x86-64
+        gcc-mingw-w64-x86-64-win32
+        g++-mingw-w64-x86-64-win32
+    - name: 💾 Cache vcpkg dependencies
+      uses: actions/cache@v4
+      with:
+        path: /usr/local/share/vcpkg/installed
+        key: vcpkg-installed
+    - name: 🌳 Install dependencies
+      run: |
+        echo VCPKG_ROOT=/usr/local/share/vcpkg >> $GITHUB_ENV
+        vcpkg install --triplet=x64-mingw-dynamic libpng libvorbis
+    - name: ⚒️ Build with gcc
+      run: |
+        cmake . -B build --preset=ci-xc
+        cmake --build build --preset ninja-quiet

CMakeLists.txt

@@ -22,9 +22,10 @@
 # CMake setup
 #
 
-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12...4.0)
 if(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
+    cmake_policy(SET CMP0048 NEW)
 endif(COMMAND cmake_policy)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -37,13 +38,41 @@ endif()
 # Note: This needs to be done before the project command
 set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE INTERNAL "internal")
 
+#-----------------------------------------------------------------------------#
+#
+#   Version
+#
+#-----------------------------------------------------------------------------#
+
+set(ALLEGRO_VERSION_REGEX_PATTERN "#define ALLEGRO_VERSION_STR[ ]+\"([0-9]+\\.[0-9]+\\.[0-9]+).*\"")
+file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/include/allegro/base.h" ALLEGRO_VERSION_MATCH
+    REGEX ${ALLEGRO_VERSION_REGEX_PATTERN}
+    LIMIT_COUNT 1
+)
+string(REGEX REPLACE ${ALLEGRO_VERSION_REGEX_PATTERN} "\\1" ALLEGRO_VERSION "${ALLEGRO_VERSION_MATCH}")
+if("${ALLEGRO_VERSION}" VERSION_LESS 5.0.0)
+    message(STATUS "[Allegro] Allegro Version: [${ALLEGRO_VERSION}]")
+else()
+    message(FATAL_ERROR "[Allegro] Invalid Allegro Version: [${ALLEGRO_VERSION}]")
+endif()
+
 #-----------------------------------------------------------------------------#
 #
 # Build options
 #
 
 # Set the project name.
-project(ALLEGRO C CXX)
+
+# Allow generating custom project name via command-line arguments (#1174)
+set(ALLEGRO_PROJECT_NAME "ALLEGRO" CACHE STRING "Project default name")
+set(ALLEGRO_PROJECT_SUFFIX "" CACHE STRING "Project suffix")
+
+project(${ALLEGRO_PROJECT_NAME}${ALLEGRO_PROJECT_SUFFIX}
+    VERSION ${ALLEGRO_VERSION}
+    LANGUAGES C CXX
+    DESCRIPTION "Allegro project"
+    HOMEPAGE_URL "https://github.com/liballeg/allegro4"
+)
 
 if(WIN32)
     if(MINGW)
@@ -291,12 +320,14 @@ if(APPLE)
     endif(COMPILER_GCC)
 endif(APPLE)
 
+if(CMAKE_SYSTEM_NAME STREQUAL Haiku)
+    set(ALLEGRO_HAIKU 1)
+    set(BEOS 1)
+elseif(CMAKE_SYSTEM_NAME STREQUAL BeOS)
+    set(ALLEGRO_BEOS 1)
+    set(BEOS 1)
+endif(CMAKE_SYSTEM_NAME STREQUAL Haiku)
 if(BEOS)
-    if(CMAKE_SYSTEM_NAME STREQUAL Haiku)
-        set(ALLEGRO_HAIKU 1)
-    else(CMAKE_SYSTEM_NAME STREQUAL Haiku)
-        set(ALLEGRO_BEOS 1)
-    endif(CMAKE_SYSTEM_NAME STREQUAL Haiku)
     set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar")
     set(WFLAGS_C_ONLY "")
     set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy")
@@ -308,8 +339,7 @@ endif()
 
 if(PSP)
     set(ALLEGRO_PSP 1)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -G0")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -G0 -fno-exceptions -fno-rtti")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
 endif(PSP)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WFLAGS} ${WFLAGS_C_ONLY}")
@@ -695,10 +725,8 @@ endif(ALLEGRO_MACOSX)
 
 if(PSP)
     include_directories(SYSTEM ${PSPSDK_PATH}/include)
-    link_directories(${PSPSDK_PATH}/lib)
+    add_link_options("-L${PSPSDK_PATH}/lib")
     list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_PSP_FILES})
-    list(APPEND PLATFORM_LIBS
-    m pspaudio pspgu psprtc pspdebug pspdisplay pspge pspctrl pspsdk c pspnet pspnet_inet pspnet_resolver psputility pspuser pspkernel)
 endif(PSP)
 
 #-----------------------------------------------------------------------------#
@@ -844,6 +872,8 @@ set_target_properties(allegro
     static_link_with "${static_link_with}"
     )
 
+set(PKG_TARGETS_NAME "${PKG_NAME}Targets")
+
 install_our_library(allegro)
 if(NOT WANT_FRAMEWORKS)
     install_our_headers(${ALLEGRO_PUBLIC_HEADERS})
@@ -871,7 +901,7 @@ if(PSP)
 	OUTPUT_NAME alleg-main${BUILD_TYPE_SUFFIX}
 	COMPILE_FLAGS -DALLEGRO_SRC
 	)
-    target_link_libraries(alleg-main pspuser pspkernel)
+    target_link_libraries(alleg-main INTERFACE c pspaudio pspdisplay pspctrl pspdebug pspgu pspge)
     target_link_libraries(allegro alleg-main)
     install_our_library(alleg-main)
 endif(PSP)
@@ -881,15 +911,15 @@ endif(PSP)
 # allegro-config script
 #
 
-if(UNIX) # including MACOSX
+if(UNIX OR MSYS OR MINGW) # including MACOSX
     set(prefix "${CMAKE_INSTALL_PREFIX}")
     set(INCLUDE_PREFIX "${CMAKE_INSTALL_PREFIX}") # not sure what this is
     if(BUILD_SHARED_LIBS)
         set(LINK_WITH_STATIC_LIBS no)
     else()
         set(LINK_WITH_STATIC_LIBS yes)
     endif()
-    set(LIB_TO_LINK alleg${BUILD_TYPE_SUFFIX})
+    set(LIB_TO_LINK ${allegro_OUTPUT_NAME}${BUILD_TYPE_SUFFIX})
     if(APPLE)
 	set(LDFLAGS "-framework Cocoa -lalleg-main")
     else(APPLE)
@@ -923,7 +953,7 @@ if(UNIX) # including MACOSX
     install(PROGRAMS ${CMAKE_BINARY_DIR}/allegro-config
             DESTINATION bin
             )
-endif(UNIX)
+endif(UNIX OR MSYS OR MINGW)
 
 #-----------------------------------------------------------------------------#
 #
@@ -947,6 +977,7 @@ endif()
 
 
 if(WANT_ALLEGROGL)
+    find_package(OpenGL)
     add_subdirectory(addons/allegrogl)
 endif()
 if(WANT_LOADPNG)
@@ -972,7 +1003,7 @@ set(PKG_CONFIG_FILES
     logg
     )
 
-if(UNIX)
+if(UNIX OR MSYS)
     set(prefix "${CMAKE_INSTALL_PREFIX}")
     set(INCLUDE_PREFIX "\${prefix}")
     set(bindir "\${exec_prefix}/bin")
@@ -997,7 +1028,53 @@ if(UNIX)
                 DESTINATION "lib${LIB_SUFFIX}/pkgconfig"
                 )
     endforeach(name)
-endif(UNIX)
+endif(UNIX OR MSYS)
+
+set(ALLEGRO_TARGETS ${PKG_CONFIG_FILES})
+# Generate CMake package-config files
+include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
+
+set(PKG_NAME "Allegro")
+string(TOLOWER ${PKG_NAME} PKG_NAME_LOWER)
+
+set(PKG_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PKG_NAME_LOWER}4")
+set(PKG_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake")
+set(PKG_CONFIG_FILE "${PKG_GENERATED_DIR}/${PKG_NAME}Config.cmake")
+set(PKG_VERSION_FILE "${PKG_GENERATED_DIR}/${PKG_NAME}ConfigVersion.cmake")
+
+configure_package_config_file(
+  "${CMAKE_CURRENT_LIST_DIR}/cmake/${PKG_NAME}Config.cmake.in"
+  ${PKG_CONFIG_FILE}
+  INSTALL_DESTINATION ${PKG_CONFIG_INSTALL_DIR}
+  NO_SET_AND_CHECK_MACRO
+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
+)
+write_basic_package_version_file(${PKG_VERSION_FILE}
+  VERSION ${ALLEGRO_VERSION}
+  COMPATIBILITY SameMajorVersion
+)
+install(
+  EXPORT ${PKG_TARGETS_NAME}
+  NAMESPACE ${PKG_NAME}::
+  DESTINATION ${PKG_CONFIG_INSTALL_DIR}
+)
+install(
+  FILES ${PKG_CONFIG_FILE} ${PKG_VERSION_FILE}
+  DESTINATION ${PKG_CONFIG_INSTALL_DIR}
+)
+
+# Export build tree for debugging
+
+target_include_directories(allegro INTERFACE
+    $<BUILD_INTERFACE:include;${PROJECT_BINARY_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+)
+
+export(EXPORT ${PKG_TARGETS_NAME}
+       FILE "${PKG_GENERATED_DIR}/${PKG_NAME}Targets.cmake"
+       NAMESPACE ${PKG_NAME}::
+)
 
 #-----------------------------------------------------------------------------#
 #