[Avida-cvs] [avida-svn] r409 - in trunk: Avida2.xcodeproj source
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Mon Dec 5 07:08:29 PST 2005
Author: brysonda
Date: 2005-12-05 10:08:29 -0500 (Mon, 05 Dec 2005)
New Revision: 409
Modified:
trunk/Avida2.xcodeproj/project.pbxproj
trunk/source/defs.h
Log:
Rework trunk's Xcode project build configurations. Set SMT_FULLY_ASSOCIATIVE on by default.
Modified: trunk/Avida2.xcodeproj/project.pbxproj
===================================================================
--- trunk/Avida2.xcodeproj/project.pbxproj 2005-11-29 23:05:37 UTC (rev 408)
+++ trunk/Avida2.xcodeproj/project.pbxproj 2005-12-05 15:08:29 UTC (rev 409)
@@ -290,33 +290,6 @@
DCC3166107628531008F7A48 /* avida.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109C0762539E008F7A48 /* avida.cc */; };
/* End PBXBuildFile section */
-/* Begin PBXBuildStyle section */
- 70486B8C08266CA2009328F0 /* Profile */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- GCC_OPTIMIZATION_LEVEL = 3;
- };
- name = Profile;
- };
- DCC30C4B0762532C008F7A48 /* Development */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- };
- name = Development;
- };
- DCC30C4C0762532C008F7A48 /* Deployment */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- DEAD_CODE_STRIPPING = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_OPTIMIZATION_LEVEL = 3;
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
-/* End PBXBuildStyle section */
-
/* Begin PBXCopyFilesBuildPhase section */
700E2B6D085DE50C00CF158A /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
@@ -1436,7 +1409,7 @@
DCC31614076253A5008F7A48 /* viewers.pro */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = viewers.pro; sourceTree = "<group>"; };
DCC31615076253A5008F7A48 /* zoom_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = zoom_screen.cc; sourceTree = "<group>"; };
DCC31616076253A5008F7A48 /* zoom_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = zoom_screen.hh; sourceTree = "<group>"; };
- DCC3164D07626CF3008F7A48 /* primitive */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = primitive; sourceTree = BUILT_PRODUCTS_DIR; };
+ DCC3164D07626CF3008F7A48 /* primitive */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = primitive; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -2948,7 +2921,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 700E2B7E085DE50C00CF158A /* Build configuration list for PBXNativeTarget "viewer" */;
buildPhases = (
- 704EAD9808FF3C1F005D5C24 /* ShellScript */,
700E2AF4085DE50C00CF158A /* Sources */,
700E2B6C085DE50C00CF158A /* Frameworks */,
700E2B6D085DE50C00CF158A /* CopyFiles */,
@@ -2987,7 +2959,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 702442D20859E0B00059BD9B /* Build configuration list for PBXNativeTarget "primitive" */;
buildPhases = (
- 704EAD8208FF2C0B005D5C24 /* ShellScript */,
DCC3164A07626CF3008F7A48 /* Sources */,
DCC3164B07626CF3008F7A48 /* Frameworks */,
70486B9508267145009328F0 /* CopyFiles */,
@@ -3030,11 +3001,6 @@
buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida2" */;
buildSettings = {
};
- buildStyles = (
- DCC30C4B0762532C008F7A48 /* Development */,
- DCC30C4C0762532C008F7A48 /* Deployment */,
- 70486B8C08266CA2009328F0 /* Profile */,
- );
hasScannedForEncodings = 0;
mainGroup = DCC30C490762532C008F7A48;
productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;
@@ -3046,35 +3012,6 @@
};
/* End PBXProject section */
-/* Begin PBXShellScriptBuildPhase section */
- 704EAD8208FF2C0B005D5C24 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/bash;
- shellScript = "mkdir -p $DERIVED_FILES_DIR\necho \"#ifndef revision_h\" > $DERIVED_FILES_DIR/revision.h\necho \"#define revision_h\" >> $DERIVED_FILES_DIR/revision.h\nif (test -x /usr/bin/svn)\nthen /usr/bin/svn status -qu | sed '$!d' | sed 's/Status against revision: *\\([0-9]*\\)/#define REVISION \"\\1\"/' >> $DERIVED_FILES_DIR/revision.h\nelif (test -x /usr/local/bin/svn)\nthen /usr/local/bin/svn status -qu | sed '$!d' | sed 's/Status against revision: *\\([0-9]*\\)/#define REVISION \"\\1\"/' >> $DERIVED_FILES_DIR/revision.h\nelif (test -x /usr/local/svn/bin/svn);\nthen /usr/local/svn/bin/svn status -qu | sed '$!d' | sed 's/Status against revision: *\\([0-9]*\\)/#define REVISION \"\\1\"/' >> $DERIVED_FILES_DIR/revision.h\nelse echo '#define REVISION \"???\"' >> $DERIVED_FILES_DIR/revision.h\nfi;\n\necho \"#endif\" >> $DERIVED_FILES_DIR/revision.h\n";
- };
- 704EAD9808FF3C1F005D5C24 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/bash;
- shellScript = "mkdir -p $DERIVED_FILES_DIR\necho \"#ifndef revision_h\" > $DERIVED_FILES_DIR/revision.h\necho \"#define revision_h\" >> $DERIVED_FILES_DIR/revision.h\nif (test -x /usr/bin/svn)\nthen /usr/bin/svn status -qu | sed '$!d' | sed 's/Status against revision: *\\([0-9]*\\)/#define REVISION \"\\1\"/' >> $DERIVED_FILES_DIR/revision.h\nelif (test -x /usr/local/bin/svn)\nthen /usr/local/bin/svn status -qu | sed '$!d' | sed 's/Status against revision: *\\([0-9]*\\)/#define REVISION \"\\1\"/' >> $DERIVED_FILES_DIR/revision.h\nelif (test -x /usr/local/svn/bin/svn);\nthen /usr/local/svn/bin/svn status -qu | sed '$!d' | sed 's/Status against revision: *\\([0-9]*\\)/#define REVISION \"\\1\"/' >> $DERIVED_FILES_DIR/revision.h\nelse echo '#define REVISION \"???\"' >> $DERIVED_FILES_DIR/revision.h\nfi;\n\necho \"#endif\" >> $DERIVED_FILES_DIR/revision.h\n";
- };
-/* End PBXShellScriptBuildPhase section */
-
/* Begin PBXSourcesBuildPhase section */
700E2AF4085DE50C00CF158A /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -3338,132 +3275,63 @@
700E2B7F085DE50C00CF158A /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = YES;
- GCC_AUTO_VECTORIZATION = YES;
- GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_FAST_MATH = YES;
GCC_MODEL_CPU = G4;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- DEBUG,
- REVISION_SUPPORT,
- );
- GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
- LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = viewer;
- SKIP_INSTALL = YES;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- );
- ZERO_LINK = YES;
};
name = Development;
};
- 700E2B80085DE50C00CF158A /* Deployment */ = {
+ 700E2B80085DE50C00CF158A /* Deployment G4 */ = {
isa = XCBuildConfiguration;
buildSettings = {
- COPY_PHASE_STRIP = YES;
- DEAD_CODE_STRIPPING = YES;
- GCC_ALTIVEC_EXTENSIONS = YES;
- GCC_AUTO_VECTORIZATION = YES;
- GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_FAST_MATH = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_CPU = G4;
- GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = REVISION_SUPPORT;
- GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
- LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = viewer;
- SKIP_INSTALL = YES;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- );
- ZERO_LINK = NO;
};
- name = Deployment;
+ name = "Deployment G4";
};
700E2B81085DE50C00CF158A /* Profile */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = YES;
- GCC_AUTO_VECTORIZATION = YES;
- GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_FAST_MATH = YES;
GCC_MODEL_CPU = G4;
- GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = REVISION_SUPPORT;
- GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
- LIBRARY_SEARCH_PATHS = "";
PRODUCT_NAME = viewer;
- SKIP_INSTALL = YES;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- );
- ZERO_LINK = YES;
};
name = Profile;
};
- 700E2B82085DE50C00CF158A /* Default */ = {
+ 702442D30859E0B00059BD9B /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = YES;
- GCC_AUTO_VECTORIZATION = YES;
- GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_FAST_MATH = YES;
GCC_MODEL_CPU = G4;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = REVISION_SUPPORT;
- GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
- LIBRARY_SEARCH_PATHS = "";
- PRODUCT_NAME = viewer;
- SKIP_INSTALL = YES;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- );
- ZERO_LINK = YES;
+ PRODUCT_NAME = primitive;
};
- name = Default;
+ name = Development;
};
- 702442D30859E0B00059BD9B /* Development */ = {
+ 702442D40859E0B00059BD9B /* Deployment G4 */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_MODEL_CPU = G4;
+ PRODUCT_NAME = primitive;
+ };
+ name = "Deployment G4";
+ };
+ 702442D50859E0B00059BD9B /* Profile */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ GCC_MODEL_CPU = G4;
+ PRODUCT_NAME = primitive;
+ };
+ name = Profile;
+ };
+ 702442D80859E0B00059BD9B /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
GCC_ALTIVEC_EXTENSIONS = YES;
GCC_AUTO_VECTORIZATION = YES;
GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_DYNAMIC_NO_PIC = YES;
GCC_FAST_MATH = YES;
- GCC_MODEL_CPU = G4;
GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- DEBUG,
- REVISION_SUPPORT,
- );
+ GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
- PRODUCT_NAME = primitive;
- SKIP_INSTALL = YES;
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
@@ -3473,115 +3341,80 @@
};
name = Development;
};
- 702442D40859E0B00059BD9B /* Deployment */ = {
+ 702442D90859E0B00059BD9B /* Deployment G4 */ = {
isa = XCBuildConfiguration;
buildSettings = {
- COPY_PHASE_STRIP = YES;
- DEAD_CODE_STRIPPING = YES;
+ DEPLOYMENT_POSTPROCESSING = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
GCC_AUTO_VECTORIZATION = YES;
- GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_DYNAMIC_NO_PIC = YES;
GCC_FAST_MATH = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_CPU = G4;
GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = REVISION_SUPPORT;
+ GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
- PRODUCT_NAME = primitive;
- SKIP_INSTALL = YES;
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
"-Wno-unknown-pragmas",
);
- ZERO_LINK = NO;
};
- name = Deployment;
+ name = "Deployment G4";
};
- 702442D50859E0B00059BD9B /* Profile */ = {
+ 702442DA0859E0B00059BD9B /* Profile */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COPY_PHASE_STRIP = NO;
GCC_ALTIVEC_EXTENSIONS = YES;
GCC_AUTO_VECTORIZATION = YES;
- GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_DYNAMIC_NO_PIC = YES;
GCC_FAST_MATH = YES;
- GCC_MODEL_CPU = G4;
GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = REVISION_SUPPORT;
+ GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
- PRODUCT_NAME = primitive;
- SKIP_INSTALL = YES;
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
"-Wno-unknown-pragmas",
);
- ZERO_LINK = YES;
};
name = Profile;
};
- 702442D60859E0B00059BD9B /* Default */ = {
+ 7073B06909448A8A0075106F /* Deployment G5 */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ALTIVEC_EXTENSIONS = YES;
- GCC_AUTO_VECTORIZATION = YES;
- GCC_DEBUGGING_SYMBOLS = full;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_FAST_MATH = YES;
GCC_MODEL_CPU = G4;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = REVISION_SUPPORT;
- GCC_UNROLL_LOOPS = YES;
- HEADER_SEARCH_PATHS = source/event/;
- INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
PRODUCT_NAME = primitive;
- SKIP_INSTALL = YES;
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-four-char-constants",
- "-Wno-unknown-pragmas",
- );
- ZERO_LINK = YES;
};
- name = Default;
+ name = "Deployment G5";
};
- 702442D80859E0B00059BD9B /* Development */ = {
+ 7073B06A09448A8A0075106F /* Deployment G5 */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_MODEL_CPU = G4;
+ PRODUCT_NAME = viewer;
};
- name = Development;
+ name = "Deployment G5";
};
- 702442D90859E0B00059BD9B /* Deployment */ = {
+ 7073B06B09448A8A0075106F /* Deployment G5 */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ DEPLOYMENT_POSTPROCESSING = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
GCC_AUTO_VECTORIZATION = YES;
GCC_DYNAMIC_NO_PIC = YES;
GCC_FAST_MATH = YES;
+ GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
GCC_UNROLL_LOOPS = YES;
+ WARNING_CFLAGS = (
+ "-Wmost",
+ "-Wno-four-char-constants",
+ "-Wno-unknown-pragmas",
+ );
};
- name = Deployment;
+ name = "Deployment G5";
};
- 702442DA0859E0B00059BD9B /* Profile */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- };
- name = Profile;
- };
- 702442DB0859E0B00059BD9B /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- };
- name = Default;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -3589,34 +3422,34 @@
isa = XCConfigurationList;
buildConfigurations = (
700E2B7F085DE50C00CF158A /* Development */,
- 700E2B80085DE50C00CF158A /* Deployment */,
+ 700E2B80085DE50C00CF158A /* Deployment G4 */,
+ 7073B06A09448A8A0075106F /* Deployment G5 */,
700E2B81085DE50C00CF158A /* Profile */,
- 700E2B82085DE50C00CF158A /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
702442D20859E0B00059BD9B /* Build configuration list for PBXNativeTarget "primitive" */ = {
isa = XCConfigurationList;
buildConfigurations = (
702442D30859E0B00059BD9B /* Development */,
- 702442D40859E0B00059BD9B /* Deployment */,
+ 702442D40859E0B00059BD9B /* Deployment G4 */,
+ 7073B06909448A8A0075106F /* Deployment G5 */,
702442D50859E0B00059BD9B /* Profile */,
- 702442D60859E0B00059BD9B /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida2" */ = {
isa = XCConfigurationList;
buildConfigurations = (
702442D80859E0B00059BD9B /* Development */,
- 702442D90859E0B00059BD9B /* Deployment */,
+ 702442D90859E0B00059BD9B /* Deployment G4 */,
+ 7073B06B09448A8A0075106F /* Deployment G5 */,
702442DA0859E0B00059BD9B /* Profile */,
- 702442DB0859E0B00059BD9B /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Development;
};
/* End XCConfigurationList section */
};
Modified: trunk/source/defs.h
===================================================================
--- trunk/source/defs.h 2005-11-29 23:05:37 UTC (rev 408)
+++ trunk/source/defs.h 2005-12-05 15:08:29 UTC (rev 409)
@@ -43,6 +43,8 @@
// -= Toggles =- (define these to actually turn features on)
+#define SMT_FULLY_ASSOCIATIVE
+
#define WRITE_PROTECTION
// #define FATAL_ERRORS
// #define FATAL_WARNINGS
More information about the Avida-cvs
mailing list