[Avida-SVN] r2199 - in stable: Avida.xcodeproj source/actions

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-11-13 12:17:34 -0500 (Tue, 13 Nov 2007)
New Revision: 2199

Modified:
   stable/Avida.xcodeproj/project.pbxproj
   stable/source/actions/EnvironmentActions.cc
Log:
Fix undefined M_PI definition under Visual Studio 2005.

Modified: stable/Avida.xcodeproj/project.pbxproj
===================================================================
--- stable/Avida.xcodeproj/project.pbxproj	2007-11-12 20:19:04 UTC (rev 2198)
+++ stable/Avida.xcodeproj/project.pbxproj	2007-11-13 17:17:34 UTC (rev 2199)
@@ -739,7 +739,7 @@
 		DCC315CE076253A5008F7A48 /* environment.rotate */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.rotate; sourceTree = "<group>"; };
 		DCC315D0076253A5008F7A48 /* task_event_gen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.cc; sourceTree = "<group>"; };
 		DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.old.cc; sourceTree = "<group>"; };
-		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCC3164D07626CF3008F7A48 /* avida */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = avida; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1556,10 +1556,12 @@
 		DCC30C4D0762532C008F7A48 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 0;
 			mainGroup = DCC30C490762532C008F7A48;
 			productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				7023ED520C0A590200362B9C /* full-suite */,
 				DCC3164C07626CF3008F7A48 /* avida */,

Modified: stable/source/actions/EnvironmentActions.cc
===================================================================
--- stable/source/actions/EnvironmentActions.cc	2007-11-12 20:19:04 UTC (rev 2198)
+++ stable/source/actions/EnvironmentActions.cc	2007-11-13 17:17:34 UTC (rev 2199)
@@ -22,7 +22,13 @@
  *
  */
 
-#include "math.h"
+#include <cmath>
+
+// M_PI is not defined under windows, so define it here
+#ifndef M_PI
+#define M_PI        3.14159265358979323846
+#endif
+
 #include "EnvironmentActions.h"
 
 #include "cAction.h"