[Avida-SVN] r1584 - in development: . source/platform

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-05-21 22:50:22 -0400 (Mon, 21 May 2007)
New Revision: 1584

Modified:
   development/Avida.vcproj
   development/source/platform/FloatingPoint.h
Log:
Update visual studio project with recent changes.  Add support for visual c++ into FloatingPoint.h.

Modified: development/Avida.vcproj
===================================================================
--- development/Avida.vcproj	2007-05-22 02:25:27 UTC (rev 1583)
+++ development/Avida.vcproj	2007-05-22 02:50:22 UTC (rev 1584)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)source\tools&quot;;&quot;$(ProjectDir)source\targets\avida-viewer&quot;;&quot;$(ProjectDir)source\platform\msvc2005&quot;;&quot;$(ProjectDir)source\platform\msvc2005\pdcurses&quot;;&quot;$(ProjectDir)source\main&quot;;&quot;$(ProjectDir)source\drivers&quot;;&quot;$(ProjectDir)source\cpu&quot;;&quot;$(ProjectDir)source\classification&quot;;&quot;$(ProjectDir)source\analyze&quot;;&quot;$(ProjectDir)source\actions&quot;;&quot;$(ProjectDir)source&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)source\tools&quot;;&quot;$(ProjectDir)source\targets\avida-viewer&quot;;&quot;$(ProjectDir)source\platform\msvc2005&quot;;&quot;$(ProjectDir)source\platform\msvc2005\pdcurses&quot;;&quot;$(ProjectDir)source\main&quot;;&quot;$(ProjectDir)source\drivers&quot;;&quot;$(ProjectDir)source\cpu&quot;;&quot;$(ProjectDir)source\classification&quot;;&quot;$(ProjectDir)source\analyze&quot;;&quot;$(ProjectDir)source\actions&quot;;&quot;$(ProjectDir)source&quot;;&quot;$(ProjectDir)source\platform&quot;"
 				PreprocessorDefinitions="NOMACROS;DEBUG;WIN32;_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)source\tools&quot;;&quot;$(ProjectDir)source\targets\avida-viewer&quot;;&quot;$(ProjectDir)source\platform\msvc2005&quot;;&quot;$(ProjectDir)source\platform\msvc2005\pdcurses&quot;;&quot;$(ProjectDir)source\main&quot;;&quot;$(ProjectDir)source\drivers&quot;;&quot;$(ProjectDir)source\cpu&quot;;&quot;$(ProjectDir)source\classification&quot;;&quot;$(ProjectDir)source\analyze&quot;;&quot;$(ProjectDir)source\actions&quot;;&quot;$(ProjectDir)source&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)source\tools&quot;;&quot;$(ProjectDir)source\targets\avida-viewer&quot;;&quot;$(ProjectDir)source\platform\msvc2005&quot;;&quot;$(ProjectDir)source\platform\msvc2005\pdcurses&quot;;&quot;$(ProjectDir)source\main&quot;;&quot;$(ProjectDir)source\drivers&quot;;&quot;$(ProjectDir)source\cpu&quot;;&quot;$(ProjectDir)source\classification&quot;;&quot;$(ProjectDir)source\analyze&quot;;&quot;$(ProjectDir)source\actions&quot;;&quot;$(ProjectDir)source&quot;;&quot;$(ProjectDir)source\platform&quot;"
 				PreprocessorDefinitions="NOMACROS;NDEBUG;WIN32;_WIN32"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -449,6 +449,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\cpu\cHardwareGX.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\source\cpu\cHardwareGX.h"
+				>
+			</File>
+			<File
 				RelativePath=".\source\cpu\cHardwareManager.h"
 				>
 			</File>
@@ -869,6 +877,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\platform\FloatingPoint.h"
+				>
+			</File>
+			<File
 				RelativePath=".\source\tools\functions.h"
 				>
 			</File>

Modified: development/source/platform/FloatingPoint.h
===================================================================
--- development/source/platform/FloatingPoint.h	2007-05-22 02:25:27 UTC (rev 1583)
+++ development/source/platform/FloatingPoint.h	2007-05-22 02:50:22 UTC (rev 1584)
@@ -17,7 +17,11 @@
 #ifdef FPE_X86
 void set_fpu (unsigned int mode)
 { 
+#ifdef WIN32
+	__asm fldcw mode;
+#else
   asm("fldcw %0" : : "m" (*&mode));
+#endif
 }
 #endif