X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;fp=engine.cpp;h=ffbe324acd490ec6eb621ce0fe8d26b3b38d3ac0;hb=43ed0accfbc2852849e104ff7eccdd2c42acd4ec;hp=ea1c0e14dc9f89fe0157d24828a2e9552297389c;hpb=5d77fd07180d1fb8561ff1962e6d7429caf8555e;p=mothur.git

diff --git a/engine.cpp b/engine.cpp
index ea1c0e1..ffbe324 100644
--- a/engine.cpp
+++ b/engine.cpp
@@ -34,7 +34,7 @@ string Engine::findMothursPath(){
 		
 		//delimiting path char
 		char delim;
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 			delim = ':';
 		#else
 			delim = ';';
@@ -56,7 +56,7 @@ string Engine::findMothursPath(){
 		
 		if (mothurPath != "") {
 			//add mothur so it looks like what argv would look like
-			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 				mothurPath += "/mothur";
 			#else
 				mothurPath += "\\mothur";
@@ -71,7 +71,7 @@ string Engine::findMothursPath(){
 				//is this mothurs path?
 				ifstream in;
 				string tempIn = dirs[i];
-				#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+				#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 					tempIn += "/mothur";
 				#else
 					tempIn += "\\mothur";
@@ -219,7 +219,7 @@ bool InteractEngine::getInput(){
 string Engine::getCommand()  {
 	try {
 	
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 			#ifdef USE_READLINE
 				char* nextCommand = NULL;
 				nextCommand = readline("mothur > ");