From e873c787141daa5171ceffed0ec2e1836378cccc Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Thu, 12 Jul 2018 22:52:18 +0000 Subject: Fixed linker error; calibration installation --- src/survive.c | 2 -- src/survive_cal.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/survive.c b/src/survive.c index e75f56b..78ddf44 100644 --- a/src/survive.c +++ b/src/survive.c @@ -21,8 +21,6 @@ STATIC_CONFIG_ITEM( CONFIG_FILE, "configfile", 's', "Default configuration file" STATIC_CONFIG_ITEM( CONFIG_D_CALI, "disable-calibrate", 'i', "Enables or disables calibration", 0 ); STATIC_CONFIG_ITEM( CONFIG_F_CALI, "force-calibrate", 'i', "Forces calibration even if one exists.", 0 ); -#define RUNTIME_SYMNUM 1 - #ifdef RUNTIME_SYMNUM #include static int did_runtime_symnum; diff --git a/src/survive_cal.c b/src/survive_cal.c index 7d32a07..febd506 100755 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -160,7 +160,8 @@ void survive_cal_install( struct SurviveContext * ctx ) const char *RequiredTrackersForCal = survive_configs(ctx, "requiredtrackersforcal", SC_SETCONFIG, ""); // If there are no mandatory trackers for calibration; by default just accept whatever it is that the person has. - const uint32_t AllowAllTrackersForCal = survive_configi(ctx, "allowalltrackersforcal", SC_SETCONFIG, strlen(RequiredTrackersForCal) == 0); + const uint32_t AllowAllTrackersForCal = + survive_configi(ctx, "allowalltrackersforcal", SC_SETCONFIG, 0) || (strlen(RequiredTrackersForCal) == 0); size_t requiredTrackersFound = 0; -- cgit v1.2.3