Merge branch 'master' of https://github.com/mothur/mothur.git into development

[mothur.git] / makefile

diff --git a/makefile b/makefile
index b8d4e2c3e30844c436e44015696ec04d5c4264d8..32ede6e5fa70a2ab42f4aa6ebcc0382b32dc8d76 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,8 +15,8 @@ USEREADLINE ?= yes
 CYGWIN_BUILD ?= no
 USECOMPRESSION ?= no
 MOTHUR_FILES="\"Enter_your_default_path_here\""
-RELEASE_DATE = "\"4/30/2012\""
-VERSION = "\"1.25.0\""
+RELEASE_DATE = "\"7/9/2012\""
+VERSION = "\"1.26.0\""
 FORTAN_COMPILER = gfortran
 FORTRAN_FLAGS = 
 
@@ -39,7 +39,7 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
        #if you are a linux user use the following line
        #CXXFLAGS += -mtune=native -march=native -m64
        
-       CXXFLAGS += -DBIT_VERSION
+       CXXFLAGS += -DBIT_VERSION 
     FORTRAN_FLAGS = -m64
 endif