Skip to content

Fix NaCl build breakage#1625

Merged
slipher merged 1 commit intoDaemonEngine:masterfrom
slipher:fix-nacl
Mar 27, 2025
Merged

Fix NaCl build breakage#1625
slipher merged 1 commit intoDaemonEngine:masterfrom
slipher:fix-nacl

Conversation

@slipher
Copy link
Copy Markdown
Member

@slipher slipher commented Mar 27, 2025

FORK=1 is needed to know whether the nacl-vms target has been created already.

FORK=1 is needed to know whether the nacl-vms target has been created
already.
@slipher
Copy link
Copy Markdown
Member Author

slipher commented Mar 27, 2025

Also this fixes another regression that you can't build the sgame and cgame DLLs/exes at the same time...

Comment thread cmake/DaemonGame.cmake
endif()

if (FORK EQUAL 1)
if (NOT FORK) # create the nacl-vms target only the first time that GAMEMODULE is called
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You don't need to set the PARENT_SCOPE if you do:

if (FORK EQUAL 1 AND NOT TARGET nacl-vms)

Copy link
Copy Markdown
Member

@illwieckz illwieckz Mar 27, 2025

Choose a reason for hiding this comment

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

In fact that would activate the following else() so it's wrong if exactly done this way.

@slipher
Copy link
Copy Markdown
Member Author

slipher commented Mar 27, 2025

Well I tried to preserve your notion of making it extensible to multiple gamelogic toolchains with multiple sub-invocations. But if you don't care about that now we could check just nacl-vms instead

@illwieckz
Copy link
Copy Markdown
Member

Instead of nacl-vms we could just name that sub-vms, the various toolchains (wasm one, etc.) could just be integrated in the exact same places the NaCl ones are.

@slipher
Copy link
Copy Markdown
Member Author

slipher commented Mar 27, 2025

Bored of bikeshedding now

@slipher slipher merged commit 886111a into DaemonEngine:master Mar 27, 2025
9 checks passed
@slipher slipher deleted the fix-nacl branch March 27, 2025 22:19
@illwieckz
Copy link
Copy Markdown
Member

It was not a suggestion to do this in this PR anyway (it would break the docker release script if I'm right), just me sharing some thoughts on what we may do in the future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants