From 0f65c830a37938bae4435a267bd098a0038b3737 Mon Sep 17 00:00:00 2001 From: Will Furnass Date: Fri, 31 Jul 2015 18:49:16 +0100 Subject: [PATCH 1/2] #define DLL_EXPORT as the empty string by default --- include/epanet2.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/epanet2.h b/include/epanet2.h index 8527d83..153fef4 100755 --- a/include/epanet2.h +++ b/include/epanet2.h @@ -47,6 +47,8 @@ #else #define DLLEXPORT #endif + #else + #define DLLEXPORT #endif #endif @@ -271,4 +273,4 @@ extern "C" { } #endif -#endif //EPANET2_H \ No newline at end of file +#endif //EPANET2_H From a35a61ef6dacd4146fe234c18fd607a3d3c4745c Mon Sep 17 00:00:00 2001 From: Will Furnass Date: Fri, 31 Jul 2015 18:50:26 +0100 Subject: [PATCH 2/2] Ensure that libm is linked to in cmake-driven builds --- build/CMake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/CMake/CMakeLists.txt b/build/CMake/CMakeLists.txt index 5aaa576..2edaf20 100644 --- a/build/CMake/CMakeLists.txt +++ b/build/CMake/CMakeLists.txt @@ -15,4 +15,4 @@ add_library(epanet STATIC ../../src/epanet.c ../../src/hydraul.c ../../src/hash # the standalone executable include_directories(../../src) add_executable(runepanet ../../run/main.c) -target_link_libraries (runepanet LINK_PUBLIC epanet) +target_link_libraries (runepanet LINK_PUBLIC epanet m)