Update cygwin and wsl1 makefiles to use the "Common Linux" scheme from PR#542; Update github workflows to use latest versions of actions #543
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # Common Options for All Linuxes | ||
|
|
||
| include linux-compiler.mk | ||
|
|
||
| ifeq ($(USE_LIBBSD),T) | ||
| include linux-libbsd.mk | ||
| else | ||
| BSD_CFLAGS := | ||
| BSD_LDFLAGS := | ||
| endif | ||
|
|
||
| ifeq ($(USE_DISPLAY),x) | ||
| include linux-x.mk | ||
| DEFAULT_TARGET := ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex | ||
| endif | ||
| ifeq ($(USE_DISPLAY),sdl) | ||
| include linux-sdl.mk | ||
| DEFAULT_TARGET := ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl | ||
| endif | ||
| ifeq ($(USE_DISPLAY),init) | ||
| include linux-x.mk | ||
| DEFAULT_TARGET := ../$(OSARCHNAME)/ldeinit | ||
| endif | ||
|
|
||
| OPTFLAGS ?= -O2 -g3 | ||
| DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) $(BSD_CFLAGS) $(ADDITIONAL_DFLAGS) | ||
|
|
||
| LDFLAGS = $(XLDFLAGS) -lc -lm $(BSD_LDFLAGS) | ||
| LDELDFLAGS = $(XLDFLAGS) -lc -lm $(BSD_LDFLAGS) | ||
|
There was a problem hiding this comment. The |
||
|
|
||
| OBJECTDIR = ../$(RELEASENAME)/ | ||
|
|
||
| default: $(DEFAULT_TARGET) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # Select whether to use clang or gcc | ||
| # Priority | ||
| # 1. If -DUSE_GCC or -DUSE_CLANG on command line (but not both) use the requested compiler. | ||
| # 2. If one compiler is installed but not the other, use the installed compiler. | ||
| # 3. Use clang | ||
|
|
||
| EXISTS_GCC := $(shell command -v gcc) | ||
| EXISTS_CLANG := $(shell command -v clang) | ||
| ifeq ($(or $(EXISTS_GCC),$(EXISTS_CLANG)),) | ||
| $(error "Cannot find compiler: neither gcc nor clang. Exiting.") | ||
| endif | ||
| ifneq ($(and $(USE_CLANG),$(USE_GCC)),) | ||
| $(error "Cannot use both USE_CLANG=T and USE_GCC=T. Exiting.") | ||
| endif | ||
| COMPILER := | ||
| ifdef USE_CLANG | ||
| ifeq ($(EXISTS_CLANG),) | ||
| $(error "USE_CLANG=T given, but cannot find the clang compiler. Exiting") | ||
| endif | ||
| COMPILER := clang | ||
| endif | ||
| ifdef USE_GCC | ||
| ifeq ($(EXISTS_GCC),) | ||
| $(error "USE_GCC=T given, but cannot find the gcc compiler. Exiting") | ||
| endif | ||
| COMPILER := gcc | ||
| endif | ||
| ifeq ($(COMPILER),) | ||
| ifneq ($(EXISTS_CLANG),) | ||
| COMPILER := clang | ||
| else | ||
| COMPILER := gcc | ||
| endif | ||
| endif | ||
|
|
||
| ifeq ($(COMPILER),gcc) | ||
| CC := gcc $(GCC_CFLAGS) | ||
| else | ||
| CC := clang $(CLANG_CFLAGS) | ||
| endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # Check that pkg-config is available and that the libbsd-dev package is installed | ||
| # If one of these is missing, error out | ||
| # FGH 2026-03-08 | ||
| ifneq ($(MAKECMDGOALS),clean) | ||
| ifneq ($(MAKECMDGOALS),cleanup) | ||
|
|
||
| CHK_PKG_CONFIG := $(shell command -v pkg-config) | ||
| ifeq ($(CHK_PKG_CONFIG),) | ||
| # pkg-config not found, print an error | ||
| $(error "pkg-config not found. Please install it to build this project.") | ||
| endif | ||
|
|
||
| CHK_LIBBSD_DEV := $(shell pkg-config --exists libbsd-overlay && echo true) | ||
| ifneq ($(CHK_LIBBSD_DEV),true) | ||
| $(error "libbsd-dev (or libbsd-devel) package not found. Please install it to build this project.") | ||
| endif | ||
| endif | ||
| endif | ||
|
|
||
| BSD_CFLAGS = $(shell pkg-config --cflags libbsd-overlay) | ||
|
|
||
| BSD_LDFLAGS = $(shell pkg-config --libs libbsd-overlay) | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # Common Options for Linux using SDL instead of X Windows | ||
|
|
||
| XFILES = $(OBJECTDIR)sdl.o | ||
|
|
||
| # | ||
| # For SDL version 2 | ||
| # -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS | ||
| # For SDL version 3 | ||
| # -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS | ||
| # | ||
| XFLAGS = -DSDL=2 | ||
|
|
||
| XLDFLAGS ?= -lSDL2 | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
execute_processcommand uses relative paths like../bin/osversion. This approach is not robust for out-of-source builds, where the build directory is not a direct subdirectory of the source root, and will cause the build to fail in such standard setups. You should use absolute paths constructed withCMAKE_SOURCE_DIRto make the command reliable regardless of the build directory location.