From 767c2ab76d70664af19b1afca8e1fd5233962698 Mon Sep 17 00:00:00 2001 From: SarahsWork Date: Fri, 15 Feb 2013 10:43:05 -0500 Subject: [PATCH] test commit --- .gitignore | 1 + Mothur.xcodeproj/project.pbxproj | 12 ++++++------ makefile | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ac6f440..853fd84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store *.zip *.pbxproj +*.xcuserdata \ No newline at end of file diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj index 33c768c..c66d967 100644 --- a/Mothur.xcodeproj/project.pbxproj +++ b/Mothur.xcodeproj/project.pbxproj @@ -368,7 +368,7 @@ outputFiles = ( "$(TARGET_BUILD_DIR)/$(INPUT_FILE_BASE).o", ); - script = "/usr/local/gfortran/bin/gfortran -g -m64 -c ${PROJECT_DIR}/${INPUT_FILE_NAME} -o ${TARGET_BUILD_DIR}/${INPUT_FILE_BASE}.o"; + script = "/usr/local/bin/gfortran -g -m64 -c ${PROJECT_DIR}/${INPUT_FILE_NAME} -o ${TARGET_BUILD_DIR}/${INPUT_FILE_BASE}.o"; }; /* End PBXBuildRule section */ @@ -2353,7 +2353,7 @@ GCC_OPTIMIZATION_LEVEL = 3; "INSTALL_PATH[sdk=*]" = TARGET_BUILD_DIR; PRODUCT_NAME = mothur; - SDKROOT = macosx10.6; + SDKROOT = macosx10.8; SKIP_INSTALL = NO; }; name = Debug; @@ -2405,7 +2405,7 @@ "-lncurses", "-lreadline", ); - SDKROOT = macosx10.6; + SDKROOT = macosx10.8; SKIP_INSTALL = NO; USER_HEADER_SEARCH_PATHS = ""; }; @@ -2421,8 +2421,8 @@ GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( - "VERSION=\"\\\"1.28.0\\\"\"", - "RELEASE_DATE=\"\\\"11/2/2012\\\"\"", + "VERSION=\"\\\"1.29.2\\\"\"", + "RELEASE_DATE=\"\\\"2/12/2013\\\"\"", ); GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -2443,7 +2443,7 @@ "-lncurses", "-lreadline", ); - SDKROOT = macosx10.6; + SDKROOT = macosx10.8; SKIP_INSTALL = NO; }; name = Release; diff --git a/makefile b/makefile index d4035c8..3ce1686 100644 --- a/makefile +++ b/makefile @@ -15,8 +15,8 @@ USEREADLINE ?= yes CYGWIN_BUILD ?= no USECOMPRESSION ?= no MOTHUR_FILES="\"Enter_your_default_path_here\"" -RELEASE_DATE = "\"1/23/2013\"" -VERSION = "\"1.29.1\"" +RELEASE_DATE = "\"2/12/2013\"" +VERSION = "\"1.29.2\"" FORTAN_COMPILER = gfortran FORTRAN_FLAGS = -- 2.39.2