added help for alignment code and thomas' calcs to project

[mothur.git] / distancecommand.cpp

diff --git a/distancecommand.cpp b/distancecommand.cpp
index 140aa6085b4007a3998ffc6a769b266464b16e6a..7d1f6a0308b5358b2ef39ef70579d866fafca6da 100644 (file)
--- a/distancecommand.cpp
+++ b/distancecommand.cpp
@@ -88,11 +88,12 @@ int DistanceCommand::execute(){
                
                remove(distFile.c_str());
                
-       //      #       if defined (WIN_VERSION)
+               //#     if defined (_WIN32)
+                       //figure out how to implement the fork and wait commands in windows
                //      driver(distCalculator, seqDB, 0, numSeqs, distFile, cutoff);
-       //      #       endif
+               //#     endif
                
-       //      #       if defined (LINUX_VERSION)
+               #       if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
                        if(processors == 1){
                                driver(distCalculator, seqDB, 0, numSeqs, distFile, cutoff);    
                        }       
@@ -168,7 +169,9 @@ int DistanceCommand::execute(){
                                wait(NULL);
                        }
                        wait(NULL);
-               //#     endif
+               #       else
+                       driver(distCalculator, seqDB, 0, numSeqs, distFile, cutoff);
+               #       endif
        
                delete distCalculator;