[Avida-cvs] [Avida2-svn] r23 - in trunk: Avida2.xcode source/main

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2005-02-23 22:57:26 -0500 (Wed, 23 Feb 2005)
New Revision: 23

Modified:
   trunk/Avida2.xcode/project.pbxproj
   trunk/source/main/population.hh
Log:
Fixed Xcode project so that my local optimization settings actually get propagated into the project file.

Modified: trunk/Avida2.xcode/project.pbxproj
===================================================================
--- trunk/Avida2.xcode/project.pbxproj	2005-02-23 21:51:24 UTC (rev 22)
+++ trunk/Avida2.xcode/project.pbxproj	2005-02-24 03:57:26 UTC (rev 23)
@@ -45,7 +45,6 @@
 		};
 		DCC30C490762532C008F7A48 = {
 			children = (
-				DCE60DB307C580B200B002E1,
 				703F684207B437B800C1CA76,
 				DCC30C670762539A008F7A48,
 				DCC3164E07626CF3008F7A48,
@@ -57,6 +56,14 @@
 		DCC30C4B0762532C008F7A48 = {
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
+				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_DYNAMIC_NO_PIC = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_CPU = G4;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				OTHER_CFLAGS = "-ffast-math -mdynamic-no-pic";
+				OTHER_CPLUSPLUSFLAGS = "-ffast-math -mdynamic-no-pic";
+				ZERO_LINK = YES;
 			};
 			isa = PBXBuildStyle;
 			name = Development;
@@ -64,6 +71,13 @@
 		DCC30C4C0762532C008F7A48 = {
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
+				GCC_DYNAMIC_NO_PIC = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_CPU = G4;
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
+				OTHER_CFLAGS = "-ffast-math -mdynamic-no-pic";
+				OTHER_CPLUSPLUSFLAGS = "-ffast-math -mdynamic-no-pic";
 			};
 			isa = PBXBuildStyle;
 			name = Deployment;
@@ -10600,11 +10614,18 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_DYNAMIC_NO_PIC = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_CPU = G4;
+				GCC_NO_COMMON_BLOCKS = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_REUSE_STRINGS = NO;
 				HEADER_SEARCH_PATHS = source/event/;
 				INSTALL_PATH = /usr/local/bin;
-				OTHER_CFLAGS = "";
+				OTHER_CFLAGS = "-ffast-math -mdynamic-no-pic";
+				OTHER_CPLUSPLUSFLAGS = "-ffast-math -mdynamic-no-pic";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = primitive;
@@ -11368,15 +11389,6 @@
 			settings = {
 			};
 		};
-		DCE60DB307C580B200B002E1 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.xml;
-			name = "third-party-osx.xml";
-			path = "documentation/xdocs/admin/third-party-osx.xml";
-			refType = 4;
-			sourceTree = "<group>";
-		};
 	};
 	rootObject = DCC30C4D0762532C008F7A48;
 }

Modified: trunk/source/main/population.hh
===================================================================
--- trunk/source/main/population.hh	2005-02-23 21:51:24 UTC (rev 22)
+++ trunk/source/main/population.hh	2005-02-24 03:57:26 UTC (rev 23)
@@ -22,7 +22,7 @@
 #ifndef STATS_HH
 #include "stats.hh"
 #endif
-#ifndef STRING_hH
+#ifndef STRING_HH
 #include "string.hh"
 #endif
 #ifndef TARRAY_HH