Skip to content

Make possible for the game cmake to tell which variable to pass to the NaCl subinvocation #1991

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
illwieckz wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −84
Open

Make possible for the game cmake to tell which variable to pass to the NaCl subinvocation #1991

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
1c807cd
cmake: make possible for the game cmake to tell which variable to pas…
illwieckz Jul 8, 2026
6e07f40
cmake: remove unused DaemonCBSE.cmake (already moved to the game)
illwieckz Jul 8, 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
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ set(DEFAULT_NACL_VM_INHERITED_OPTIONS
BUILD_CGAME
BUILD_SGAME
CMAKE_BUILD_TYPE
DAEMON_CBSE_PYTHON_PATH
USE_ARCH_INTRINSICS
USE_COMPILER_CUSTOMIZATION
USE_COMPILER_INTRINSICS
Expand Down
81 changes: 0 additions & 81 deletions cmake/DaemonCBSE.cmake
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cmake/DaemonGame.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ function(GAMEMODULE)

set(INHERITED_OPTION_ARGS)

foreach(inherited_option ${NACL_VM_INHERITED_OPTIONS})
set(INHERITED_OPTION_ARGS ${INHERITED_OPTION_ARGS}
foreach(inherited_option IN LISTS NACL_VM_INHERITED_OPTIONS GAME_NACL_VM_INHERITED_OPTIONS)
list(APPEND INHERITED_OPTION_ARGS
"-D${inherited_option}=${${inherited_option}}")
endforeach(inherited_option)

Expand Down
Loading