Merge remote-tracking branch 'mothur/master'

diff --git a/.gitignore b/.gitignore
index c1f854e3d6c22d93a5a03c0e365c472a1da46d68..ac6f4409bf8be051d0665c0743bf853f42579f25 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 *.zip
+*.pbxproj

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index d98b28443921915890802e12777ab374aa31d402..f7e48a0119466f512be811abdf92fe39635370c0 100644 (file)
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -2206,7 +2206,7 @@
                                DEPLOYMENT_LOCATION = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_OPTIMIZATION_LEVEL = 3;
                                PRODUCT_NAME = mothur;
                                SDKROOT = macosx10.6;
                                SKIP_INSTALL = NO;
@@ -2220,6 +2220,7 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                DEPLOYMENT_LOCATION = YES;
                                GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_WARN_UNUSED_VALUE = YES;
                                PRODUCT_NAME = mothur;
                                SKIP_INSTALL = NO;
@@ -2235,7 +2236,7 @@
                                GCC_ENABLE_SSE3_EXTENSIONS = NO;
                                GCC_ENABLE_SSE41_EXTENSIONS = NO;
                                GCC_ENABLE_SSE42_EXTENSIONS = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "MOTHUR_FILES=\"\\\"../release\\\"\"",
                                        "VERSION=\"\\\"1.25.0\\\"\"",
@@ -2272,7 +2273,7 @@
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = "";
-                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_OPTIMIZATION_LEVEL = 3;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "VERSION=\"\\\"1.25.0\\\"\"",
                                        "RELEASE_DATE=\"\\\"4/30/2012\\\"\"",