Skip to content

rdatawad: fix cross-building #778

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

rdatawad: fix cross-building #778

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
6ccd62a
data: Call dsda_rdatawad with the full target file name
fabiangreffrath Oct 2, 2025
ede6228
data: Pass *_FOR_BUILD build flags when cross-building
fabiangreffrath Oct 7, 2025
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
2 changes: 2 additions & 0 deletions prboom2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ if(DSDA_BUILD_PWAD_WITH_EXTERNAL_PROJECT)
"-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
"-DWAD_DATA_PATH:FILEPATH=${WAD_DATA_PATH}"
"-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${DSDA_HOST_TOOLCHAIN}"
"-DCMAKE_C_FLAGS:STRING=$ENV{CFLAGS_FOR_BUILD} $ENV{CPPFLAGS_FOR_BUILD}"
"-DCMAKE_EXE_LINKER_FLAGS:STRING=$ENV{LDFLAGS_FOR_BUILD}"
BUILD_ALWAYS TRUE
BUILD_BYPRODUCTS "${WAD_DATA_PATH}"
INSTALL_COMMAND ""
Expand Down
2 changes: 1 addition & 1 deletion prboom2/data/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ set(WAD_CMDLINE

add_custom_command(
OUTPUT ${WAD_DATA_PATH}
COMMAND dsda_rdatawad -I "${CMAKE_CURRENT_SOURCE_DIR}" ${WAD_CMDLINE} -o "${WAD_DATA_PATH}"
COMMAND $<TARGET_FILE:dsda_rdatawad> -I "${CMAKE_CURRENT_SOURCE_DIR}" ${WAD_CMDLINE} -o "${WAD_DATA_PATH}"
DEPENDS dsda_rdatawad ${WAD_SRC}
VERBATIM
)
Expand Down
Loading