From 42f70f579f92594b6b739ba0bf70572f115c0418 Mon Sep 17 00:00:00 2001 From: Elad Salomons Date: Sun, 17 Jun 2018 07:48:25 +0300 Subject: [PATCH 1/2] Remove strange string from types.h and fix win_build make file --- src/types.h | 2 +- win_build/WinSDK/Makefile.bat | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/types.h b/src/types.h index 89a5467..6babe9a 100755 --- a/src/types.h +++ b/src/types.h @@ -50,7 +50,7 @@ typedef int INT4; #define MAXMSG 79 /* Max. # characters in message text */ #define MAXLINE 255 /* Max. # characters read from input line */ #define MAXFNAME 259 /* Max. # characters in file name */ ->>>>>>> f11308fc72eccc8b74b18d5ddab0eb2ae0d36587 +//>>>>>>> f11308fc72eccc8b74b18d5ddab0eb2ae0d36587 #define MAXTOKS 40 /* Max. items per line of input */ #define TZERO 1.E-4 /* Zero time tolerance */ #define TRUE 1 diff --git a/win_build/WinSDK/Makefile.bat b/win_build/WinSDK/Makefile.bat index eeb967e..d0a00c3 100644 --- a/win_build/WinSDK/Makefile.bat +++ b/win_build/WinSDK/Makefile.bat @@ -21,9 +21,9 @@ Find /i "x86" < checkOS.tmp > StringCheck.tmp If %ERRORLEVEL% == 1 ( CALL "%SDK_PATH%bin\"SetEnv.cmd /x64 /release rem : create EPANET2.DLL - cl -o epanet2.dll epanet.c hash.c hydraul.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /link /DLL + cl -o epanet2.dll epanet.c hash.c hydraul.c hydcoeffs.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /link /DLL rem : create EPANET2.EXE - cl -o epanet2.exe epanet.c ..\run\main.c hash.c hydraul.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /I ..\src /link + cl -o epanet2.exe epanet.c ..\run\main.c hash.c hydraul.c hydcoeffs.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /I ..\src /link md "%Build_PATH%"\64bit move /y "%SRC_PATH%"\*.dll "%Build_PATH%"\64bit move /y "%SRC_PATH%"\*.exe "%Build_PATH%"\64bit @@ -35,9 +35,9 @@ rem : 32 bit with DEF CALL "%SDK_PATH%bin\"SetEnv.cmd /x86 /release echo "32 bit with epanet2.def mapping" rem : create EPANET2.DLL -cl -o epanet2.dll epanet.c hash.c hydraul.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /link /DLL /def:..\win_build\WinSDK\epanet2.def /MAP +cl -o epanet2.dll epanet.c hash.c hydraul.c hydcoeffs.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /link /DLL /def:..\win_build\WinSDK\epanet2.def /MAP rem : create EPANET2.EXE -cl -o epanet2.exe epanet.c ..\run\main.c hash.c hydraul.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /I ..\src /link +cl -o epanet2.exe epanet.c ..\run\main.c hash.c hydraul.c hydcoeffs.c hydsolver.c inpfile.c input1.c input2.c input3.c mempool.c output.c quality.c report.c rules.c smatrix.c /I ..\include /I ..\run /I ..\src /link md "%Build_PATH%"\32bit move /y "%SRC_PATH%"\*.dll "%Build_PATH%"\32bit move /y "%SRC_PATH%"\*.exe "%Build_PATH%"\32bit From c41e140b6aebc5bc2d41463c67a3db0c69756917 Mon Sep 17 00:00:00 2001 From: Elad Salomons Date: Tue, 19 Jun 2018 11:16:32 +0300 Subject: [PATCH 2/2] Update VB header files --- include/epanet2.bas | 2 ++ include/epanet2.vb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/epanet2.bas b/include/epanet2.bas index 789a441..0826a3b 100644 --- a/include/epanet2.bas +++ b/include/epanet2.bas @@ -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 diff --git a/include/epanet2.vb b/include/epanet2.vb index 44a47a1..fcb71af 100644 --- a/include/epanet2.vb +++ b/include/epanet2.vb @@ -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