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

Merge pull request #20 from willfurnass/patch-2-0-13-building_on_linux

Browse Source 
Building on Linux: #define DLL_EXPORT as the empty string and link to libm
This commit is contained in:
Sam Hatchett
2015-07-31 15:04:04 -04:00
parent a3c7eaae15 a35a61ef6d
commit 4248947f3a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/CMake/CMakeLists.txt
View File

@@ -15,4 +15,4 @@ add_library(epanet STATIC ../../src/epanet.c ../../src/hydraul.c ../../src/hash
# the standalone executable # the standalone executable
include_directories(../../src) include_directories(../../src)
add_executable(runepanet ../../run/main.c) add_executable(runepanet ../../run/main.c)
target_link_libraries (runepanet LINK_PUBLIC epanet) target_link_libraries (runepanet LINK_PUBLIC epanet m)

4
include/epanet2.h
View File

@@ -47,6 +47,8 @@
#else #else
#define DLLEXPORT #define DLLEXPORT
#endif #endif
#else
#define DLLEXPORT
#endif #endif
#endif #endif
@@ -271,4 +273,4 @@ extern "C" {
} }
#endif #endif
#endif //EPANET2_H #endif //EPANET2_H