Changeset 492

Timestamp:

03/31/16 00:34:37 (9 years ago)

Author:

Maciej Komosinski

Message:

emscripten compatibility

Location:

cpp

Files:

• common/nonstd_math.cpp (modified) (1 diff)
• common/nonstd_math.h (modified) (1 diff)
• frams/canvas/nn_smart_layout.cpp (modified) (1 diff)
• frams/genetics/geno.h (modified) (2 diffs)
• frams/model/similarity/simil_model.cpp (modified) (1 diff)
• frams/neuro/neuroimpl.cpp (modified) (1 diff)

cpp/common/nonstd_math.cpp

@@ -14 +14 @@
 
 
-#if defined __BORLANDC__ || (_MSC_VER <= 1700)
+#if (defined __BORLANDC__ || (_MSC_VER <= 1700)) & (!defined EMSCRIPTEN)
 double round(double val) //http://stackoverflow.com/questions/2170385/c-math-functions
 {    

cpp/common/nonstd_math.h

@@ -17 +17 @@
 #endif
 
-#if defined __BORLANDC__ || (_MSC_VER <= 1700)
-double round(double val);  //http://stackoverflow.com/questions/2170385/c-math-functions
+#if (defined __BORLANDC__ || (_MSC_VER <= 1700)) & (!defined EMSCRIPTEN)
+  double round(double val);  //http://stackoverflow.com/questions/2170385/c-math-functions
 #endif
 

cpp/frams/canvas/nn_smart_layout.cpp

@@ -9 +9 @@
  #include <alloc.h> //borland needs for alloc/free
 #endif
-#ifdef MACOS
+#if (defined MACOS) | (defined EMSCRIPTEN)
  #include <stdlib.h>
 #endif

cpp/frams/genetics/geno.h

@@ -17 +17 @@
 public:
         virtual int testGenoValidity(Geno& g) = 0;/// -1=no information  0=invalid  1=valid
+        virtual ~GenoValidator() { };
 };
 
@@ -25 +26 @@
 public:
         int testGenoValidity(Geno& g);
+        ~ModelGenoValidator() { }
 };
 

cpp/frams/model/similarity/simil_model.cpp

@@ -13 +13 @@
 #include "common/nonstd.h"
 #include <frams/vm/classes/genoobj.h>
-#include <stdlib.h>
+#ifdef EMSCRIPTEN
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
 #include <math.h>
 #include <string>

cpp/frams/neuro/neuroimpl.cpp

@@ -458 +458 @@
 #endif
 
+#ifndef SDK_WITHOUT_FRAMS
 extern ParamEntry creature_paramtab[];
 static Param creature_param(creature_paramtab,0);
+#endif
 
 Creature* NeuroImpl::getCreature()