X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=c67f0ba6bd2d5a3baf675edef32fbd15679259fc;hb=aca78ed4a47dff8672ea8fd93cef0dfbaf0f7495;hp=e2e66c152650226dda8bde8f43d93a5e660c2895;hpb=896a4f281982a3c2889f6ce6d73be997072aceae;p=mothur.git

diff --git a/makefile b/makefile
index e2e66c1..c67f0ba 100644
--- a/makefile
+++ b/makefile
@@ -12,12 +12,12 @@
 USEMPI ?= no
 64BIT_VERSION ?= yes
 USEREADLINE ?= yes
-CYGWIN_BUILD ?= no
 USECOMPRESSION ?= no
 MOTHUR_FILES="\"Enter_your_default_path_here\""
-RELEASE_DATE = "\"1/9/2012\""
-VERSION = "\"1.23.0\""
+RELEASE_DATE = "\"2/12/2014\""
+VERSION = "\"1.33.0\""
 FORTAN_COMPILER = gfortran
+FORTRAN_FLAGS = 
 
 # Optimize to level 3:
 CXXFLAGS += -O3 
@@ -32,12 +32,13 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
 	#if you using cygwin to build Windows the following line
 	#CXX = x86_64-w64-mingw32-g++
 	#CC = x86_64-w64-mingw32-g++
+	#FORTAN_COMPILER = x86_64-w64-mingw32-gfortran
  	#TARGET_ARCH += -m64 -static
 
 	#if you are a linux user use the following line
-	#CXXFLAGS += -mtune=native -march=native -m64
+	#CXXFLAGS += -mtune=native -march=native 
 	
-	 CXXFLAGS += -DBIT_VERSION
+	CXXFLAGS += -DBIT_VERSION 
 endif
 
 
@@ -48,10 +49,6 @@ else
 	CXXFLAGS += -DMOTHUR_FILES=${MOTHUR_FILES}
 endif
 
-ifeq  ($(strip $(CYGWIN_BUILD)),yes)
-    CXXFLAGS += -mno-cygwin
-    LDFLAGS += -mno-cygwin 
-endif
 
 # if you do not want to use the readline library, set this to no.
 # make sure you have the library installed
@@ -96,12 +93,12 @@ mothur : fortranSource $(OBJECTS) uchime
 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
 	
 	strip mothur
-
+ 
 uchime:
 	cd uchime_src && ./mk && mv uchime .. && cd ..
 	
 fortranSource:
-	${FORTAN_COMPILER} -c *.f
+	${FORTAN_COMPILER} -c $(FORTRAN_FLAGS) *.f
 
 install : mothur
 #	cp mothur ../Release/mothur