[Avida-cvs] [avida-svn] r1024 - in branches/coopcomm: Avida.xcodeproj source/analyze source/platform/win32-pthread source/tools

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2006-10-01 00:17:54 -0400 (Sun, 01 Oct 2006)
New Revision: 1024

Modified:
   branches/coopcomm/Avida.xcodeproj/project.pbxproj
   branches/coopcomm/source/analyze/cAnalyze.cc
   branches/coopcomm/source/platform/win32-pthread/pthread.h
   branches/coopcomm/source/tools/cDataFileManager.cc
Log:
Merged trunk changes r993:1023 into coopcomm branch.

Modified: branches/coopcomm/Avida.xcodeproj/project.pbxproj
===================================================================
--- branches/coopcomm/Avida.xcodeproj/project.pbxproj	2006-10-01 03:54:55 UTC (rev 1023)
+++ branches/coopcomm/Avida.xcodeproj/project.pbxproj	2006-10-01 04:17:54 UTC (rev 1024)
@@ -360,19 +360,6 @@
 		E626209E0A372C2A00C07685 /* SaveLoadActions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 708051A80A1F65FE00CBB8B6 /* SaveLoadActions.cc */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildRule section */
-		70DCAD2A097AF865002F8733 /* PBXBuildRule */ = {
-			isa = PBXBuildRule;
-			compilerSpec = com.apple.compilers.proxy.script;
-			fileType = sourcecode.lex;
-			isEditable = 1;
-			outputFiles = (
-				"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).cc",
-			);
-			script = "flex -+ -o${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.cc ${INPUT_FILE_PATH}";
-		};
-/* End PBXBuildRule section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		700E2B6D085DE50C00CF158A /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -1726,7 +1713,6 @@
 				70DCAD08097AF7CC002F8733 /* CopyFiles */,
 			);
 			buildRules = (
-				70DCAD2A097AF865002F8733 /* PBXBuildRule */,
 			);
 			dependencies = (
 			);

Modified: branches/coopcomm/source/analyze/cAnalyze.cc
===================================================================
--- branches/coopcomm/source/analyze/cAnalyze.cc	2006-10-01 03:54:55 UTC (rev 1023)
+++ branches/coopcomm/source/analyze/cAnalyze.cc	2006-10-01 04:17:54 UTC (rev 1024)
@@ -7232,7 +7232,6 @@
   while (init_file.GetLineNum() < init_file.GetNumLines()) {
     cString cur_string = init_file.GetNextLine();
     cString command = cur_string.PopWord();
-    command.ToUpper();
     
     cAnalyzeCommand* cur_command;
     cAnalyzeCommandDefBase* command_def = FindAnalyzeCommandDef(command);

Modified: branches/coopcomm/source/platform/win32-pthread/pthread.h
===================================================================
--- branches/coopcomm/source/platform/win32-pthread/pthread.h	2006-10-01 03:54:55 UTC (rev 1023)
+++ branches/coopcomm/source/platform/win32-pthread/pthread.h	2006-10-01 04:17:54 UTC (rev 1024)
@@ -15,14 +15,14 @@
 
 // Just define away mutex support
 #define pthread_mutex_t int
-#define pthread_mutex_init(x)
+#define pthread_mutex_init(x, y)
 #define pthread_mutex_lock(x)
 #define pthread_mutex_unlock(x)
 #define pthread_mutex_destroy(x)
 
 // Just define away condition variable support
 #define pthread_cond_t int
-#define pthread_cond_init(x)
+#define pthread_cond_init(x, y)
 #define pthread_cond_wait(x, y)
 #define pthread_cond_signal(x)
 #define pthread_cond_broadcast(x)

Modified: branches/coopcomm/source/tools/cDataFileManager.cc
===================================================================
--- branches/coopcomm/source/tools/cDataFileManager.cc	2006-10-01 03:54:55 UTC (rev 1023)
+++ branches/coopcomm/source/tools/cDataFileManager.cc	2006-10-01 04:17:54 UTC (rev 1024)
@@ -12,7 +12,11 @@
 
 #include "cTools.h"
 
+#ifdef WIN32
+#include <direct.h>
+#else
 #include <unistd.h>
+#endif
 
 #define MAXIMUM_DIRECTORY_LENGTH 2048