From 2b60bec5b57cba229d05100ada14d72a9fa71bea Mon Sep 17 00:00:00 2001 From: Elad Salomons Date: Thu, 18 Jan 2018 13:55:22 +0200 Subject: [PATCH] Fix VB header file and win build script --- win_build/WinSDK/Makefile.bat | 4 ++-- win_build/WinSDK/epanet2.def | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/win_build/WinSDK/Makefile.bat b/win_build/WinSDK/Makefile.bat index dcf942c..eeb967e 100644 --- a/win_build/WinSDK/Makefile.bat +++ b/win_build/WinSDK/Makefile.bat @@ -27,7 +27,7 @@ If %ERRORLEVEL% == 1 ( md "%Build_PATH%"\64bit move /y "%SRC_PATH%"\*.dll "%Build_PATH%"\64bit move /y "%SRC_PATH%"\*.exe "%Build_PATH%"\64bit - copy "%H_PATH%"\*.h "%Build_PATH%"\64bit + rem copy "%H_PATH%"\*.h "%Build_PATH%"\64bit ) @@ -35,7 +35,7 @@ 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:..\build\WinSDK\epanet2.def /MAP +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 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 md "%Build_PATH%"\32bit diff --git a/win_build/WinSDK/epanet2.def b/win_build/WinSDK/epanet2.def index e54a0e1..f6376d6 100644 --- a/win_build/WinSDK/epanet2.def +++ b/win_build/WinSDK/epanet2.def @@ -86,4 +86,5 @@ EXPORTS ENsettrueaction = _ENsettrueaction@20 ENgetfalseaction = _ENgetfalseaction@20 ENsetfalseaction = _ENsetfalseaction@20 - ENgetruleID = _ENgetruleID@8 \ No newline at end of file + ENgetruleID = _ENgetruleID@8 + ENsetflowunits = _ENsetflowunits@4 \ No newline at end of file