Skip to content

[pull] master from beyond-all-reason:master #5

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
pull merged 4 commits into from
Jun 20, 2026
Merged

[pull] master from beyond-all-reason:master #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e91a58f
CUtils: use const dirent* for the scandir selector on all platforms
tomjn Jun 20, 2026
580100a
legacy: only require X11 on non-Apple UNIX
tomjn Jun 20, 2026
d13dcd3
FindSevenZip: also accept the 7zz binary name
tomjn Jun 20, 2026
0da81b4
macOS: remove dead SDL 1.2-era SDLMain.{m,h}
tomjn Jun 19, 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: 0 additions & 4 deletions AI/Wrappers/CUtils/Util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,11 +487,7 @@ static void util_initFileSelector(const char* suffix) {
fileSelectorSuffix = suffix;
}

#if defined(__APPLE__)
static int util_fileSelector(struct dirent* fileDesc) {
#else
static int util_fileSelector(const struct dirent* fileDesc) {
#endif
return util_endsWith(fileDesc->d_name, fileSelectorSuffix);
}

Expand Down
18 changes: 0 additions & 18 deletions rts/System/Platform/Mac/SDLMain.h
View file
Open in desktop

This file was deleted.

299 changes: 0 additions & 299 deletions rts/System/Platform/Mac/SDLMain.m
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion rts/build/cmake/FindSevenZip.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENDIF (SEVENZIP_BIN)
set(progfilesx86 "ProgramFiles(x86)")

find_program(SEVENZIP_BIN
NAMES 7z 7za
NAMES 7z 7za 7zz
HINTS "${MINGWDIR}" "${MINGWLIBS}/bin" "$ENV{${progfilesx86}}/7-zip" "$ENV{ProgramFiles}/7-zip" "$ENV{ProgramW6432}/7-zip"
PATH_SUFFIXES bin
DOC "7zip executable"
Expand Down
2 changes: 1 addition & 1 deletion rts/builds/legacy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ find_freetype_hack() # hack to find different named freetype.dll
find_package_static(Freetype 2.8.1 REQUIRED)
list(APPEND engineLibraries Freetype::Freetype)

if (UNIX)
if (UNIX AND NOT APPLE)
find_package(X11 REQUIRED)
target_link_libraries(Game PRIVATE X11::Xcursor)
list(APPEND engineLibraries ${X11_Xcursor_LIB} ${X11_X11_LIB})
Expand Down