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

Merge pull request #19 from willfurnass/add_missing_def_to_toolkit_h

Browse Source 
Add EN_LINKPATTERN to epanet2.h as hotfix to master
This commit is contained in:
Sam Hatchett
2015-07-31 14:44:21 -04:00
parent 87a8aaaef8 b245f4a5a7
commit 350d32c1ef
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Linux/Makefile
View File

@@ -54,7 +54,7 @@ docdir = $(datarootdir)/doc/epanet
# Compiler and flags # Compiler and flags
CC = gcc CC = gcc
CFLAGS = -g -O3 -fPIC CFLAGS = -g -O3 -fPIC -std=c99
CPPFLAGS = -I $(epanetincludedir) CPPFLAGS = -I $(epanetincludedir)
LDFLAGS = -L . -Wl,-rpath,$(libdir) -lm LDFLAGS = -L . -Wl,-rpath,$(libdir) -lm

2
build/Linux/Makefile_Rev
View File

@@ -57,7 +57,7 @@ docdir = $(datarootdir)/doc/epanet
# Compiler and flags # Compiler and flags
CC = gcc CC = gcc
CFLAGS = -g -O3 -fPIC CFLAGS = -g -O3 -fPIC -std=c99
CPPFLAGS = -I $(epanetincludedir) CPPFLAGS = -I $(epanetincludedir)
LDFLAGS = -L . -Wl,-rpath,$(libdir) -lm LDFLAGS = -L . -Wl,-rpath,$(libdir) -lm

1
include/epanet2.h
View File

@@ -84,6 +84,7 @@
#define EN_SETTING 12 #define EN_SETTING 12
#define EN_ENERGY 13 #define EN_ENERGY 13
#define EN_LINKQUAL 14 /* TNT */ #define EN_LINKQUAL 14 /* TNT */
#define EN_LINKPATTERN 15
#define EN_DURATION 0 /* Time parameters */ #define EN_DURATION 0 /* Time parameters */
#define EN_HYDSTEP 1 #define EN_HYDSTEP 1