From a04650ee50b531aed526687376a02727355fd083 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 6 May 2026 19:07:30 +0200 Subject: [PATCH 1/3] McXtrace/union platform independence: Swap bare -lxrl for @XRLFLAGS@ --- mcxtrace-comps/union/Compton_xrl_process.comp | 2 +- mcxtrace-comps/union/KN_xrl_process.comp | 2 +- mcxtrace-comps/union/Rayleigh_xrl_process.comp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mcxtrace-comps/union/Compton_xrl_process.comp b/mcxtrace-comps/union/Compton_xrl_process.comp index 794b276523..690b55fa92 100644 --- a/mcxtrace-comps/union/Compton_xrl_process.comp +++ b/mcxtrace-comps/union/Compton_xrl_process.comp @@ -52,7 +52,7 @@ DEFINE COMPONENT Compton_xrl_process DEFINITION PARAMETERS () SETTING PARAMETERS (density=0,atomno=14, string element="", string init="init") OUTPUT PARAMETERS (This_process,Compton_xrl_storage) -DEPENDENCY "-lxrl" +DEPENDENCY " @XRLFLAGS@ " /* X-ray parameters: (x,y,z,kx,ky,kz,phi,t,Ex,Ey,Ez,p) */ SHARE diff --git a/mcxtrace-comps/union/KN_xrl_process.comp b/mcxtrace-comps/union/KN_xrl_process.comp index 0465e3b8eb..6705664db2 100644 --- a/mcxtrace-comps/union/KN_xrl_process.comp +++ b/mcxtrace-comps/union/KN_xrl_process.comp @@ -49,7 +49,7 @@ DEFINE COMPONENT KN_xrl_process DEFINITION PARAMETERS () SETTING PARAMETERS (density=0, string init="init") OUTPUT PARAMETERS (This_process,KN_xrl_storage) -DEPENDENCY "-lxrl" +DEPENDENCY " @XRLFLAGS@ " /* X-ray parameters: (x,y,z,kx,ky,kz,phi,t,Ex,Ey,Ez,p) */ SHARE diff --git a/mcxtrace-comps/union/Rayleigh_xrl_process.comp b/mcxtrace-comps/union/Rayleigh_xrl_process.comp index cdd4ac0ac0..af9e2cb42b 100644 --- a/mcxtrace-comps/union/Rayleigh_xrl_process.comp +++ b/mcxtrace-comps/union/Rayleigh_xrl_process.comp @@ -51,7 +51,7 @@ DEFINE COMPONENT Rayleigh_xrl_process DEFINITION PARAMETERS () SETTING PARAMETERS (density=0,atomno=14, string element="", string init="init") OUTPUT PARAMETERS (This_process,Rayleigh_xrl_storage) -DEPENDENCY "-lxrl" +DEPENDENCY " @XRLFLAGS@ " /* X-ray parameters: (x,y,z,kx,ky,kz,phi,t,Ex,Ey,Ez,p) */ SHARE From a9b23102053c35c5145a3f927ee6303c3e268405 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 6 May 2026 19:09:08 +0200 Subject: [PATCH 2/3] Include-path to install share should be automatic already --- mcxtrace-comps/union/Union_master.comp | 1 - 1 file changed, 1 deletion(-) diff --git a/mcxtrace-comps/union/Union_master.comp b/mcxtrace-comps/union/Union_master.comp index e01c5fec99..2b5391bb07 100644 --- a/mcxtrace-comps/union/Union_master.comp +++ b/mcxtrace-comps/union/Union_master.comp @@ -60,7 +60,6 @@ SETTING PARAMETERS(verbal = 1, inherit_number_of_scattering_events=0, string init="init") OUTPUT PARAMETERS () -DEPENDENCY "-I@MCCODE_LIB@/share/" NOACC /* X-ray parameters: (x,y,z,kx,ky,kz,t,phi,Ex,Ey,Ez,p) */ From 9161d68b41d780a81ddc644b8369b967c9595250 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 6 May 2026 21:24:27 +0200 Subject: [PATCH 3/3] Pick up from also on Windows - conda is sane --- mcxtrace-comps/union/Compton_xrl_process.comp | 7 ------- mcxtrace-comps/union/KN_xrl_process.comp | 7 ------- mcxtrace-comps/union/Rayleigh_xrl_process.comp | 7 ------- 3 files changed, 21 deletions(-) diff --git a/mcxtrace-comps/union/Compton_xrl_process.comp b/mcxtrace-comps/union/Compton_xrl_process.comp index 690b55fa92..c9c3bd32e4 100644 --- a/mcxtrace-comps/union/Compton_xrl_process.comp +++ b/mcxtrace-comps/union/Compton_xrl_process.comp @@ -65,14 +65,7 @@ SHARE #endif -/* If on windows this should likely be set like this - * since xraylib.h is not (as a standard) installed - * into an xraylib subdir*/ -#ifdef _WIN32 -#include -#else #include -#endif struct Compton_xrl_physics_storage_struct{ char name[13]; diff --git a/mcxtrace-comps/union/KN_xrl_process.comp b/mcxtrace-comps/union/KN_xrl_process.comp index 6705664db2..0d6e945564 100644 --- a/mcxtrace-comps/union/KN_xrl_process.comp +++ b/mcxtrace-comps/union/KN_xrl_process.comp @@ -62,14 +62,7 @@ SHARE #endif -/* If on windows this should likely be set like this - * since xraylib.h is not (as a standard) installed - * into an xraylib subdir*/ -#ifdef _WIN32 -#include -#else #include -#endif struct KN_xrl_physics_storage_struct{ char name[13]; diff --git a/mcxtrace-comps/union/Rayleigh_xrl_process.comp b/mcxtrace-comps/union/Rayleigh_xrl_process.comp index af9e2cb42b..1580bed1fc 100644 --- a/mcxtrace-comps/union/Rayleigh_xrl_process.comp +++ b/mcxtrace-comps/union/Rayleigh_xrl_process.comp @@ -64,14 +64,7 @@ SHARE #endif -/* If on windows this should likely be set like this - * since xraylib.h is not (as a standard) installed - * into an xraylib subdir*/ -#ifdef _WIN32 -#include -#else #include -#endif struct Rayleigh_xrl_physics_storage_struct{ char name[13];