Skip to content
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

Jump to bottom

ports/devilutionx: Always enable ZeroTier #12947

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ports/devilutionx: Always enable ZeroTier #12947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 1 addition & 12 deletions package/batocera/ports/devilutionx/devilutionx.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,11 @@ DEVILUTIONX_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release
DEVILUTIONX_CONF_OPTS += -DBUILD_TESTING=OFF
# Prefill the player name when creating a new character,
# in case the device does not have a keyboard.
DEVILUTIONX_CONF_OPTS += -DPREFILL_PLAYER_NAME=ON
DEVILUTIONX_CONF_OPTS += -DPREFILL_PLAYER_NAME=ON
# Ensure that DevilutionX's vendored dependencies are not accidentally fetched from network.
# They should all be present in the source package.
DEVILUTIONX_CONF_OPTS += -DFETCHCONTENT_FULLY_DISCONNECTED=ON

# ZeroTier on aarch64 uses ARMv8 Cryptography Extensions.
# These extension are optional and only certain Armv8-A CPUs support them.
# Disables ZeroTier if the CPU compilation flags do not specify the "+crypto" extension.
ifeq ($(BR2_aarch64)$(BR2_ARM_CPU_ARMV8A),yy)
ifneq ($(findstring +crypto,$(BR2_TARGET_OPTIMIZATION)),+crypto)
DEVILUTIONX_CONF_OPTS += -DDISABLE_ZERO_TIER=ON
endif
else ifeq ($(BR2_arm),y)
DEVILUTIONX_CONF_OPTS += -DDISABLE_ZERO_TIER=ON
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: Might have to bring this back for 32-bit if it causes build errors on some 32-bit arm systems

endif

# ugly hack becuase the is no version in the source file
# and using the git tag doesn't download the submodules properly
define DEVILUTIONX_CLEAR_DL
Expand Down