From 0cadc2d0efbdba661f3c41e6bca43c8cefb283b7 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Fri, 6 Jul 2018 09:42:49 -0600 Subject: Fixed symbol enumeration for windows --- src/survive.c | 4 ++-- src/survive_cal.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/survive.c b/src/survive.c index 911a900..e75f56b 100644 --- a/src/survive.c +++ b/src/survive.c @@ -21,6 +21,8 @@ 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; @@ -110,8 +112,6 @@ static void PrintMatchingDrivers( const char * prefix, const char * matchingpara } } - - SurviveContext *survive_init_internal(int argc, char *const *argv) { int i; diff --git a/src/survive_cal.c b/src/survive_cal.c index 79519b6..7d32a07 100755 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -157,9 +157,11 @@ void survive_cal_install( struct SurviveContext * ctx ) // setting the required trackers for calibration to be permissive to make it easier for a newbie to start-- // basically, libsurvive will detect whatever they have plugged in and start using that. -// const char * RequiredTrackersForCal = config_read_str(ctx->global_config_values, "RequiredTrackersForCal", "HMD,WM0,WM1"); const char *RequiredTrackersForCal = survive_configs(ctx, "requiredtrackersforcal", SC_SETCONFIG, ""); - const uint32_t AllowAllTrackersForCal = survive_configi(ctx, "allowalltrackersforcal", SC_SETCONFIG, 0); + + // 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); + size_t requiredTrackersFound = 0; for (int j=0; j < ctx->objs_ct; j++) @@ -185,7 +187,7 @@ void survive_cal_install( struct SurviveContext * ctx ) { SV_INFO("Calibration is NOT using %s; device count exceeds MAX_DEVICES_TO_CAL", ctx->objs[j]->codename); } - } + } } -- cgit v1.2.3