Merge branch 'dev' into pr86

2018-08-30 17:55:35 +03:00
parent 8991d6baf9 7d374338a7
commit 7d8d780a8b
8 changed files with 54 additions and 30 deletions
--- a/include/epanet2.h
+++ b/include/epanet2.h
@@ -30,9 +30,7 @@
  #define EN_API_FLOAT_TYPE float
 #endif

-#ifdef WITH_GENX
-  #include "epanet_export.h"
-#else 
+#ifdef NO_GENX
  // --- define WINDOWS
  #undef WINDOWS
  #ifdef _WIN32
@@ -62,6 +60,8 @@
      #define DLLEXPORT
    #endif
  #endif
+#else 
+  #include "epanet_export.h"
 #endif