diff --git a/CMakeLists.txt b/CMakeLists.txt index 10cf0e14..05ce4723 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,3 +45,8 @@ add_subdirectory(mcpelauncher-core) add_subdirectory(mcpelauncher-client) add_subdirectory(mcpelauncher-server) + +option(MSA_DAEMON_PATH "Additional paths in which the MSA daemon should be looked in. Relative to the application directory." ) +if (MSA_DAEMON_PATH) + target_compile_definitions(mcpelauncher-client PRIVATE -DMSA_DAEMON_PATH="${MSA_DAEMON_PATH}") +endif() diff --git a/daemon-utils b/daemon-utils index 0a50006d..bdda53a4 160000 --- a/daemon-utils +++ b/daemon-utils @@ -1 +1 @@ -Subproject commit 0a50006d1a01c43c7e01ddac32bd8882f9ed1dc0 +Subproject commit bdda53a453c8852ac02cc2cf5a5716965f664a48 diff --git a/mcpelauncher-client b/mcpelauncher-client index 444ab2f0..7b47ef89 160000 --- a/mcpelauncher-client +++ b/mcpelauncher-client @@ -1 +1 @@ -Subproject commit 444ab2f08116d91ef264172360f86ca6fc2b6fc1 +Subproject commit 7b47ef89a4c8085a243f485b2c4f5ac76517c694