Skip to content

Merging to utilize cmake SDK unification and github workflow fix for Ubuntu removing Azure conflict. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timfox merged 2 commits into from
Jan 27, 2026
Merged

Merging to utilize cmake SDK unification and github workflow fix for Ubuntu removing Azure conflict. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d66cada
CMake: integrate inline FindSDL2.cmake for improved SDL2 detection an…
timfox Jan 26, 2026
ba3c865
CI: remove Azure CLI sources from build workflow to prevent conflicts
timfox Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ jobs:

- name: Install tools
run: |
sudo rm -f /etc/apt/sources.list.d/azure-cli.list
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
if [ ${{ matrix.arch }} == "x86" ]; then
sudo dpkg --add-architecture i386
sudo apt-get -qq update
Expand Down Expand Up @@ -313,6 +315,8 @@ jobs:

- name: Install tools
run: |
sudo rm -f /etc/apt/sources.list.d/azure-cli.list
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get -qq update
sudo apt-get install -y make gcc g++ cmake ninja-build
sudo apt-get -y install libcurl4-openssl-dev mesa-common-dev libxxf86dga-dev libxrandr-dev libxxf86vm-dev libasound-dev libsdl2-dev
Expand Down
124 changes: 98 additions & 26 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,101 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.24)

PROJECT(idtech3)

# --- Begin FindSDL2.cmake
# -------------------------------------------------------------
# Adapted FindSDL2.cmake module for CMake
#
# (Full CMake FindSDL2.cmake functionality inlined here for build portability)
# This logic will try to locate an SDL2 installation, define imported targets,
# and provide variables similar to the canonical FindSDL2.cmake
#
# Minimal compatibility implementation follows:
# -------------------------------------------------------------
#
# Variables defined:
# SDL2_FOUND
# SDL2_INCLUDE_DIR
# SDL2_INCLUDE_DIRS
# SDL2_LIBRARY
# SDL2_LIBRARIES
# Targets defined (if found):
# SDL2::Core
# SDL2::SDL2
# SDL2::Main
#
# Usage (as in this CMakeLists.txt):
# find_package(SDL2 REQUIRED)
# target_link_libraries(foo SDL2::Main)
#
# Only for local inline usage -- not a full drop-in for all SDL2 find modules.
#
# -------------------------------------------------------------
set(_SDL2_HINT_PATHS
$ENV{SDL2_DIR}
$ENV{SDL2_PATH}
${CMAKE_PREFIX_PATH}
${CMAKE_INSTALL_PREFIX}
/usr/local
/usr
/opt/local
/opt
/sw
)
Copy link

@cursor cursor bot Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SDL2_PATH CMake variable ignored, breaking macOS builds

High Severity

The inline SDL2 finder uses $ENV{SDL2_PATH} (environment variable) but the macOS CI workflow passes -DSDL2_PATH="${SDL2_PREFIX}" (CMake cache variable). These are different namespaces, so the Homebrew SDL2 path won't be used. Since /opt/homebrew (Apple Silicon Homebrew prefix) isn't in the hardcoded hint paths, macOS builds will fail to find SDL2.

Fix in Cursor Fix in Web


find_path(SDL2_INCLUDE_DIR
NAMES SDL.h SDL2/SDL.h
PATH_SUFFIXES SDL2 include
PATHS ${_SDL2_HINT_PATHS}
)

# Try SDL2::SDL2 (split main and core lib), or fallback to sdl2 for older systems
set(_SDL2_LIB_NAMES SDL2 SDL2-2.0 SDL2d)
Copy link

@cursor cursor bot Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FreeBSD SDL2 library name typo breaks discovery

Medium Severity

The SDL2 library name list contains SDL2-2.0 but the FreeBSD ports system uses SDL-2.0 (without the extra 2 before the dash). The deleted FindSDL2.cmake had the correct name with a comment explaining "SDL-2.0 is the name used by FreeBSD ports... don't confuse it for the version number." This typo will cause FreeBSD builds to fail finding SDL2.

Fix in Cursor Fix in Web

find_library(SDL2_LIBRARY
NAMES ${_SDL2_LIB_NAMES}
PATH_SUFFIXES lib64 lib
PATHS ${_SDL2_HINT_PATHS}
)

# Common main helper (may not be present)
find_library(SDL2_MAIN_LIBRARY
NAMES SDL2main
PATH_SUFFIXES lib64 lib
PATHS ${_SDL2_HINT_PATHS}
)

if(SDL2_INCLUDE_DIR AND SDL2_LIBRARY)
set(SDL2_FOUND TRUE)
set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
if(SDL2_MAIN_LIBRARY)
set(SDL2_LIBRARIES ${SDL2_LIBRARY} ${SDL2_MAIN_LIBRARY})
else()
set(SDL2_LIBRARIES ${SDL2_LIBRARY})
endif()

if(NOT TARGET SDL2::Core)
add_library(SDL2::Core UNKNOWN IMPORTED)
set_target_properties(SDL2::Core PROPERTIES
IMPORTED_LOCATION "${SDL2_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}")
endif()
if(NOT TARGET SDL2::SDL2)
add_library(SDL2::SDL2 ALIAS SDL2::Core)
endif()
if(SDL2_MAIN_LIBRARY AND NOT TARGET SDL2::Main)
add_library(SDL2::Main UNKNOWN IMPORTED)
set_target_properties(SDL2::Main PROPERTIES
IMPORTED_LOCATION "${SDL2_MAIN_LIBRARY}"
INTERFACE_LINK_LIBRARIES SDL2::Core
)
elseif(NOT TARGET SDL2::Main)
add_library(SDL2::Main INTERFACE IMPORTED)
set_property(TARGET SDL2::Main PROPERTY INTERFACE_LINK_LIBRARIES SDL2::Core)
endif()
else()
set(SDL2_FOUND FALSE)
endif()
# --- End FindSDL2.cmake

SET(CNAME "idtech3")
SET(DNAME "idtech3_server")

Expand All @@ -15,7 +110,7 @@ OPTION(USE_VULKAN "" ON)
OPTION(USE_MP3 "Enable MP3 codec support" ON)
OPTION(USE_SYSTEM_JPEG "" OFF)
OPTION(USE_RENDERER_DLOPEN "" ON)
OPTION(SKIP_IDPAK_CHECK "Skip checking for original Quake III pak files (pak0.pk3)" OFF)
OPTION(SKIP_IDPAK_CHECK "Skip checking for original Quake III pak files (pak0.pk3)" ON)

SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)

Expand Down Expand Up @@ -250,31 +345,8 @@ ADD_LIBRARY(q3ui OBJECT ${Q3_UI_SRCS})

IF(NOT MSVC)
IF(USE_SDL)
find_package(SDL2 REQUIRED)
# Ensure compatibility: if the FindSDL2 module didn't create SDL2::Core/SDL2::Main/SDL2::SDL2
# targets (varies between systems / config vs module mode), synthesize lightweight IMPORTED targets
if(NOT TARGET SDL2::Core)
if(DEFINED SDL2_LIBRARY AND SDL2_LIBRARY)
add_library(SDL2::Core UNKNOWN IMPORTED)
set_property(TARGET SDL2::Core PROPERTY IMPORTED_LOCATION "${SDL2_LIBRARY}")
if(DEFINED SDL2_INCLUDE_DIR AND SDL2_INCLUDE_DIR)
set_property(TARGET SDL2::Core PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}")
endif()
elseif(DEFINED SDL2_LIBRARIES AND SDL2_LIBRARIES)
add_library(SDL2::Core UNKNOWN IMPORTED)
set_property(TARGET SDL2::Core PROPERTY INTERFACE_LINK_LIBRARIES "${SDL2_LIBRARIES}")
if(DEFINED SDL2_INCLUDE_DIR AND SDL2_INCLUDE_DIR)
set_property(TARGET SDL2::Core PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}")
endif()
endif()
endif()
# Provide aliases expected by some FindSDL2 implementations
if(NOT TARGET SDL2::SDL2 AND TARGET SDL2::Core)
add_library(SDL2::SDL2 ALIAS SDL2::Core)
endif()
if(NOT TARGET SDL2::Main AND TARGET SDL2::Core)
add_library(SDL2::Main INTERFACE IMPORTED)
set_property(TARGET SDL2::Main PROPERTY INTERFACE_LINK_LIBRARIES SDL2::Core)
if(NOT SDL2_FOUND)
message(FATAL_ERROR "SDL2 could not be found. Please install or set SDL2_DIR/SDL2_PATH.")
endif()
TARGET_LINK_LIBRARIES(q3ui SDL2::Main)
ELSEIF(UNIX)
Expand Down
Loading
Loading