JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merging latest from dev, trying to get import lib generated

Browse Source
This commit is contained in:
Michael Tryby
2018-07-03 17:38:40 -04:00
parent ddd08e3d5f e1456718a4
commit ff2c851b1c
73 changed files with 3622 additions and 16583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/epanet2.bas
View File

@@ -128,6 +128,8 @@ Public Const EN_ACCURACY = 1
Public Const EN_TOLERANCE = 2
Public Const EN_EMITEXPON = 3
Public Const EN_DEMANDMULT = 4
Public Const EN_HEADERROR = 5
Public Const EN_FLOWCHANGE = 6
Public Const EN_LOWLEVEL = 0 ' Control types
Public Const EN_HILEVEL = 1

61
include/epanet2.h
View File

@@ -30,36 +30,37 @@
#define EN_API_FLOAT_TYPE float
#endif
// --- define WINDOWS
#undef WINDOWS
#ifdef _WIN32
#define WINDOWS
#endif
#ifdef __WIN32__
#define WINDOWS
#endif
// // --- define WINDOWS
// #undef WINDOWS
// #ifdef _WIN32
// #define WINDOWS
// #endif
// #ifdef __WIN32__
// #define WINDOWS
// #endif
// --- define DLLEXPORT
#ifndef DLLEXPORT
#ifdef WINDOWS
#ifdef __cplusplus
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT __declspec(dllexport) __stdcall
#endif // __cplusplus
#elif defined(CYGWIN)
#define DLLEXPORT __stdcall
#elif defined(__APPLE__)
#ifdef __cplusplus
#define DLLEXPORT
#else
#define DLLEXPORT
#endif
#else
#define DLLEXPORT
#endif
#endif
// // --- define DLLEXPORT
// #ifndef DLLEXPORT
// #ifdef WINDOWS
// #ifdef __cplusplus
// #define DLLEXPORT __declspec(dllexport)
// #else
// #define DLLEXPORT __declspec(dllexport) __stdcall
// #endif // __cplusplus
// #elif defined(CYGWIN)
// #define DLLEXPORT __stdcall
// #elif defined(__APPLE__)
// #ifdef __cplusplus
// #define DLLEXPORT
// #else
// #define DLLEXPORT
// #endif
// #else
// #define DLLEXPORT
// #endif
// #endif
#include "epanet_export.h"
// --- Define the EPANET toolkit constants
@@ -211,7 +212,9 @@ typedef enum {
EN_ACCURACY = 1,
EN_TOLERANCE = 2,
EN_EMITEXPON = 3,
EN_DEMANDMULT = 4
EN_DEMANDMULT = 4,
EN_HEADERROR = 5,
EN_FLOWCHANGE = 6
} EN_Option;
typedef enum {

2
include/epanet2.vb
View File

@@ -121,6 +121,8 @@ Public Const EN_ACCURACY = 1
Public Const EN_TOLERANCE = 2
Public Const EN_EMITEXPON = 3
Public Const EN_DEMANDMULT = 4
Public Const EN_HEADERROR = 5
Public Const EN_FLOWCHANGE = 6
Public Const EN_LOWLEVEL = 0 ' Control types
Public Const EN_HILEVEL = 1