[Avida-SVN] r1071 - in development: . source/cpu

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2006-11-04 17:30:46 -0500 (Sat, 04 Nov 2006)
New Revision: 1071

Modified:
   development/SConstruct
   development/source/cpu/cHardwareCPU.cc
Log:
Fixes permitting build under Visual Studio 2005; but this version of Avida still doesn't run under windows.

Modified: development/SConstruct
===================================================================
--- development/SConstruct	2006-11-02 21:54:33 UTC (rev 1070)
+++ development/SConstruct	2006-11-04 22:30:46 UTC (rev 1071)
@@ -95,7 +95,9 @@
     duplicate = 0
   )
 
+
 if environment['PLATFORM'] == 'win32':
+  environment.Import('avida_exe')
   script_to_build_avida = environment.File(
     os.path.join('#', os.path.basename(sys.argv[0]))
   ).abspath
@@ -105,6 +107,7 @@
     incs = environment['avida_msvs_project_incs'],
     misc = environment['avida_msvs_project_misc'],
     variant = 'Release',
+    buildtarget = avida_exe,
     #runfile = avida[0].abspath,
     MSVSSCONS = '"%s" "%s"' % (sys.executable, script_to_build_avida),
     MSVSSCONSFLAGS = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f "${MSVSSCONSCRIPT.name}"'

Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc	2006-11-02 21:54:33 UTC (rev 1070)
+++ development/source/cpu/cHardwareCPU.cc	2006-11-04 22:30:46 UTC (rev 1071)
@@ -2839,7 +2839,7 @@
   
   if ((last_num_resources != res_count.GetSize()))
   {
-      max_label_length = (int)ceil(log(res_count.GetSize())/log(num_nops));
+      max_label_length = (int)ceil(log((double)res_count.GetSize())/log((double)num_nops));
       last_num_resources = res_count.GetSize();
   }