diff --git a/libexec/trick/convert_swig b/libexec/trick/convert_swig index 56011745..7710a575 100755 --- a/libexec/trick/convert_swig +++ b/libexec/trick/convert_swig @@ -218,8 +218,9 @@ sub process_file() { $raw_contents = ; # remove all comments, they can cause all kinds of trouble - # leave the line continuation character if present in a c++ style comment. - $raw_contents =~ s/\/\*(?:.*?)\*\/|\/\/(?:.*?)(\\)?(\n)/$1\n/sg ; + # leave the line continuation character if present + $raw_contents =~ s/\/\*(?:.*?)\*\/(\s*\\\n)?/$1/sg ; + $raw_contents =~ s/\/\/(?:.*?)(\\)?(\n)/$1\n/sg ; ## The init_attr functions cause problems when we try and wrap them with SWIG. ## We can safely remove them from the header files. diff --git a/trick_sims/SIM_ode/S_overrides.mk b/trick_sims/SIM_ode/S_overrides.mk index 304de7cc..9c43cab3 100644 --- a/trick_sims/SIM_ode/S_overrides.mk +++ b/trick_sims/SIM_ode/S_overrides.mk @@ -2,6 +2,7 @@ ODE_HOME = /users/alin/ode-0.14 TRICK_ICG_EXCLUDE = ${ODE_HOME}/ode/src/array.h:${ODE_HOME}/ode/src/threading_base.h +TRICK_ICG_NOCOMMENT = ${ODE_HOME} TRICK_SWIG_EXCLUDE = ${ODE_HOME} TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME}