Changeset 135 for cpp/common

Timestamp:

02/17/14 12:32:11 (11 years ago)

Author:

sz

Message:

neuron layout algorithm (for schematic drawing), usage example in frams/_demos/neuro_layout_test.cpp

Location:

cpp/common

Files:

• nonstd.h (modified) (3 diffs)
• nonstd_math.cpp (modified) (1 diff)
• nonstd_math.h (modified) (1 diff)

cpp/common/nonstd.h

@@ -55 +55 @@
   #define stricmp(a,b) strcasecmp(a,b)
  #endif
-#ifdef INITIAL_DIR_IS_HOME
- #include "cwd.h"
- #define GET_APP_HOME getAppHome()
-#else
- #define GET_APP_HOME "./"
-#endif
-#ifdef INITIAL_DIR_IS_RES
- #include "cwd.h"
- #define GET_APP_RESOURCES getAppResources()
-#else
- #define GET_APP_RESOURCES "./"
-#endif
 #endif
 
@@ -96 +84 @@
 #endif
 
+#ifdef LINUX
+ #define GET_APP_HOME "./"
+ #define GET_APP_RESOURCES "./"
+#endif
+
 #if defined(_WIN32) && !defined(SHP)
     #define GET_APP_HOME ".\\"
@@ -101 +94 @@
 #endif
 
+#ifdef INITIAL_DIR_IS_HOME
+ #include "cwd.h"
+ #ifdef GET_APP_HOME
+  #undef GET_APP_HOME
+ #endif
+ #define GET_APP_HOME getAppHome()
+#endif
 
-
+#ifdef INITIAL_DIR_IS_RES
+ #include "cwd.h"
+ #ifdef GET_APP_RESOURCES
+  #undef GET_APP_RESOURCES
+ #endif
+ #define GET_APP_RESOURCES getAppResources()
+#endif
 
 //typedef unsigned char boolean; //niestety nie mozna uzyc 'bool' bo VC w rpcndr.h wlasnie tak definiuje booleana, jako unsigned char

cpp/common/nonstd_math.cpp

@@ -14 +14 @@
 
 
-#ifdef _WIN32 //http://stackoverflow.com/questions/2170385/c-math-functions
-double round(double val)
+#if defined __BORLANDC__ || (_MSC_VER <= 1700)
+double round(double val) //http://stackoverflow.com/questions/2170385/c-math-functions
 {    
     return floor(val + 0.5);

cpp/common/nonstd_math.h

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