X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.cpp;h=cb8d1e8715e518ed0d307fc2d50ab46961e21f92;hb=80c3fe03a8fd1635d3ad7918ff00beb973449f50;hp=4f91c2e90a0b52aa8c3f51140e857660e8ba038f;hpb=84f93a9e670eb7f7e69e0468b9be4c53890c07f2;p=mothur.git diff --git a/mothur.cpp b/mothur.cpp index 4f91c2e..cb8d1e8 100644 --- a/mothur.cpp +++ b/mothur.cpp @@ -12,7 +12,6 @@ #include "globaldata.hpp" #include "mothurout.h" - /**************************************************************************************************/ GlobalData* GlobalData::_uniqueInstance = 0; @@ -58,7 +57,7 @@ int main(int argc, char *argv[]){ m->mothurOutEndLine(); m->mothurOutEndLine(); #else m->mothurOutJustToLog("Linux version"); - >m->mothurOutEndLine(); m->mothurOutEndLine(); + m->mothurOutEndLine(); m->mothurOutEndLine(); #endif #else @@ -72,10 +71,25 @@ int main(int argc, char *argv[]){ m->mothurOutEndLine(); m->mothurOutEndLine(); #endif + #ifdef MOTHUR_FILES + string temp = MOTHUR_FILES; + m->setDefaultPath(temp); + m->mothurOutJustToLog("Using default file location " + temp); + m->mothurOutEndLine(); m->mothurOutEndLine(); + #endif + + #ifdef BIT_VERSION + m->mothurOutJustToLog("Running 64Bit Version"); + m->mothurOutEndLine(); m->mothurOutEndLine(); + #else + m->mothurOutJustToLog("Running 32Bit Version"); + m->mothurOutEndLine(); m->mothurOutEndLine(); + #endif + //header - m->mothurOut("mothur v.1.9"); + m->mothurOut("mothur v.1.11.0"); m->mothurOutEndLine(); - m->mothurOut("Last updated: 4/16/2010"); + m->mothurOut("Last updated: 6/18/2010"); m->mothurOutEndLine(); m->mothurOutEndLine(); m->mothurOut("by");